FengChaoYu hai 15 horas
pai
achega
0cf702147e

+ 5 - 5
mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -186,7 +186,7 @@ public class AdminUserLogic {
                             .eq(WebsitContractSignRecord::getStatus, SignContractStatusEnum.OK.getKey())
                             .eq(WebsitContractSignRecord::getStatus, SignContractStatusEnum.OK.getKey())
                             .ge(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDateTime(DateUtil.date()))
                             .ge(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDateTime(DateUtil.date()))
                             .count();
                             .count();
-//                    log.info("没有签成功并且审核通过未过期的记录,进行下一步检查{}", existCount);
+                    log.info("没有签成功并且审核通过未过期的记录,进行下一步检查{}", existCount);
                     // 没有签成功并且审核通过未过期的记录,进行下一步检查
                     // 没有签成功并且审核通过未过期的记录,进行下一步检查
                     if (existCount == 0) {
                     if (existCount == 0) {
                         // 查询是否有状态为待签约或待审核的
                         // 查询是否有状态为待签约或待审核的
@@ -196,11 +196,11 @@ public class AdminUserLogic {
                                 .ge(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDateTime(DateUtil.date()))
                                 .ge(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDateTime(DateUtil.date()))
                                 .isNull(WebsitContractSignRecord::getCancelTime)
                                 .isNull(WebsitContractSignRecord::getCancelTime)
                                 .count();
                                 .count();
-//                        log.info("查询是否有状态为待签约或待审核的{}", existCount);
+                        log.info("查询是否有状态为待签约或待审核的{}", existCount);
                         if (existCount == 0) {
                         if (existCount == 0) {
                             List<ContractTemplate> contractList = commonMapper.queryNeedContract(adminUser.getCompanyWechatId(), websit.getWebsitId(), DateUtil.date());
                             List<ContractTemplate> contractList = commonMapper.queryNeedContract(adminUser.getCompanyWechatId(), websit.getWebsitId(), DateUtil.date());
                             if (CollectionUtil.isEmpty(contractList)) {
                             if (CollectionUtil.isEmpty(contractList)) {
-//                            adminUserCom.setContractSignInfo("未发现网点需要签约合同,请联系管理员处理");
+                                adminUserCom.setContractSignInfo("未发现网点需要签约合同,请联系管理员处理");
                             } else if (CollectionUtil.isNotEmpty(contractList) && contractList.size() > 1) {
                             } else if (CollectionUtil.isNotEmpty(contractList) && contractList.size() > 1) {
                                 adminUserCom.setContractSignInfo("发现网点需要签约合同多份,请联系管理员处理");
                                 adminUserCom.setContractSignInfo("发现网点需要签约合同多份,请联系管理员处理");
                             } else {
                             } else {
@@ -306,13 +306,13 @@ public class AdminUserLogic {
                                         websitContractSignItemService.saveBatch(signItemList);
                                         websitContractSignItemService.saveBatch(signItemList);
                                         websitContractSignFieldService.saveBatch(signFieldList);
                                         websitContractSignFieldService.saveBatch(signFieldList);
                                         adminUserCom.setIsJumpSign(true);
                                         adminUserCom.setIsJumpSign(true);
-//                                        log.info("生成签约记录跳转");
+                                        log.info("生成签约记录跳转");
                                         break;
                                         break;
                                     }
                                     }
                                 }
                                 }
                             }
                             }
                         } else {
                         } else {
-//                            log.info("已有签约记录跳转");
+                            log.info("已有签约记录跳转");
                             adminUserCom.setIsJumpSign(true);
                             adminUserCom.setIsJumpSign(true);
                             break;
                             break;
                         }
                         }