jiaosong
2023-10-30 ad92f42691c3f5b1804bbc56040b93877e336995
# log日志
已修改5个文件
已重命名1个文件
64 ■■■■■ 文件已修改
server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/utils/Date.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);