server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -178,15 +178,15 @@ } // éªè¯å·¥å· if (StringUtils.isNotBlank(systemUser.getEmpNo())) { queryUserDto = new SystemUser(); queryUserDto.setEmpNo(systemUser.getEmpNo()); queryUserDto.setDeleted(Constants.ZERO); user = systemUserService.findOne(queryUserDto); if (user != null && !user.getId().equals(systemUser.getId())) { throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "å·¥å·å·²åå¨"); } } // if (StringUtils.isNotBlank(systemUser.getEmpNo())) { // queryUserDto = new SystemUser(); // queryUserDto.setEmpNo(systemUser.getEmpNo()); // queryUserDto.setDeleted(Constants.ZERO); // SystemUser user1 = systemUserService.findOne(queryUserDto); // if (user1 != null && !user1.getId().equals(systemUser.getId())) { // throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "å·¥å·å·²åå¨"); // } // } if ("admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "è¶ çº§ç®¡çåè´¦å·ä¸å 许ç¦ç¨"); } server/services/src/main/java/com/doumee/core/utils/Date.java
@@ -41,4 +41,15 @@ calendar.set(Calendar.MILLISECOND, 0); return calendar.getTime(); } public java.util.Date getDayOfEnd (java.util.Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.set(Calendar.DATE, calendar.get(Calendar.DATE)); calendar.set(Calendar.HOUR_OF_DAY, 23); calendar.set(Calendar.MINUTE, 59); calendar.set(Calendar.SECOND, 59); calendar.set(Calendar.MILLISECOND, 0); return calendar.getTime(); } } server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
ÎļþÃû´Ó server/services/src/main/java/com/doumee/dao/business/vo/RefundPlatExportVO.java ÐÞ¸Ä @@ -21,30 +21,40 @@ @ApiModel("åå°ç»ç®å¯¼åºä¿¡æ¯") public class RefundPlatExportVO { @ApiModelProperty(value = "ç¼ç ") @ExcelColumn(name="ç¼ç ",width = 10,index = 2,align = HorizontalAlignment.CENTER) private String id; @ApiModelProperty(value = "ç¨æ·") @ExcelColumn(name="鿬¾äº¤æåå·" ,width = 10,index = 2,align = HorizontalAlignment.CENTER) @ExcelColumn(name="ç¨æ·" ,width = 10,index = 1,align = HorizontalAlignment.CENTER) private String openid; @ApiModelProperty(value = "æ¯ä»æ¼é交æåå·") @ApiModelProperty(value = "ç¼ç ") @ExcelColumn(name="ç³»ç»åå·",width = 10,index = 2,align = HorizontalAlignment.CENTER) private String id; @ApiModelProperty(value = "鿬¾äº¤æåå·") @ExcelColumn(name="鿬¾äº¤æåå·" ,width = 10,index = 3,align = HorizontalAlignment.CENTER) private String onlineOrderid; @ApiModelProperty(value = "æ¯ä»æ¼é交æåå·") // @ExcelColumn(name="交æåå·" ,width = 10,index = 3,align = HorizontalAlignment.CENTER) private String payOnlineOrderid; @ApiModelProperty(value = "å¯ééé¢", example = "1") @ExcelColumn(name="å¯éåæ¼éï¼å ï¼" ,width = 10,index = 4,align = HorizontalAlignment.CENTER) @ExcelColumn(name="å½åå¯éåæ¼éï¼å ï¼" ,width = 10,index = 4,align = HorizontalAlignment.CENTER) private BigDecimal canBanlance; @ApiModelProperty(value = "交æéé¢", example = "1") @ExcelColumn(name="éåæ¼é(å )" ,width = 10,index = 5,align = HorizontalAlignment.CENTER) private BigDecimal money; @ApiModelProperty(value = "鿬¾äº¤æåå·") @ExcelColumn(name="鿬¾äº¤æåå·" ,width = 10,index = 6,align = HorizontalAlignment.CENTER) private String onlineOrderid; @ApiModelProperty(value = "æä½æ¶é´") @ExcelColumn(name="æä½æ¶é´" ,width = 10,index = 7,align = HorizontalAlignment.CENTER) private Date doneDate; @ApiModelProperty(value = "æä½äºº") @ExcelColumn(name="鿬¾äº¤æåå·" ,width = 10,index = 8,align = HorizontalAlignment.CENTER) @ExcelColumn(name="æä½äºº" ,width = 10,index = 8,align = HorizontalAlignment.CENTER) private String creatorName; @ApiModelProperty(value = "鿬¾åå ") @ExcelColumn(name="åå " ,width = 10,index = 9,align = HorizontalAlignment.CENTER) private String reason; server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -554,7 +554,7 @@ if(canBalance.compareTo(money) >= Constants.ZERO){ RefundDTO refundDTO = new RefundDTO(); refundDTO.setOrderId(orderId); refundDTO.setCanBalance(canBalance); refundDTO.setCanBalance(canBalance.multiply(new BigDecimal(100))); refundDTO.setRefundAmount(money.multiply(new BigDecimal(100))); refundDTO.setTotalAmount(goodsorder.getMoney()); refundDTO.setMemberId(goodsorder.getMemberId()); server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -95,7 +95,7 @@ .set(PricingParam::getName,pricingParam.getName()) // .set(PricingParam::getStatus,pricingParam.getStatus()) .set(PricingParam::getStartDate,pricingParam.getStartDate()) .set(PricingParam::getEndDate,pricingParam.getEndDate()) .set(PricingParam::getEndDate,Utils.Date.getDayOfEnd(pricingParam.getEndDate())) .set(PricingParam::getSortnum,pricingParam.getSortnum()); pricingParamMapper.update(null,wrapper); } server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
@@ -113,6 +113,7 @@ if (!CollectionUtils.isEmpty(refundIPage.getRecords())){ refundIPage.getRecords().forEach(s->{ s.setMoney(Constants.translateMoney(s.getMoney())); s.setCanBalance(Constants.translateMoney(s.getCanBalance())); }); } return PageData.from(refundIPage);