zjh
2023-11-06 4aa9b8cb058bcf4bae95d80810ce2ccde3406ee8
zjh 2023/11/06--1
2个文件已修改
3 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
@@ -251,6 +251,7 @@
        tjFlowingWater.setPaidIn(BigDecimal.valueOf(0.00).subtract(tjFlowingWater.getRefundPrice()));
        tjFlowingWater.setCopeWith(flowingWater.getCopeWith());
        tjFlowingWater.setRemarks("已退费");
        tjFlowingWater.setPayType(flowingWater.getPayType());
        if (flowingWaterService.save(tjFlowingWater)) {
            flowingWater.setRemarks("已退费");
            flowingWaterService.updateById(flowingWater);
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -153,7 +153,7 @@
                            if(!SecurityUtils.isAdmin(user.getUserId())){
                                if(dictHosp.getSecretKey() != null && dictHosp.getExpirationTime() != null){
                                    if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),
                                            dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {
                                            dictHosp.getExpirationTime(),dictHosp.getSecretKey()) || new Date().after(DateUtil.endOfDay(dictHosp.getExpirationTime()))) {
                                        throw new SecretKeyException("商家已过期请续费使用");
                                    }
                                    long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);