Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/withdrawal/WithdrawalLogic.java

@@ -183,7 +183,7 @@ public class WithdrawalLogic {
 
     public SettlementAmountBean totalAmount(){
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-        return this.totalAmount(currentCompanyWechat.getUser().getWorkerNumber(),null,null);
+        return this.totalAmount(currentCompanyWechat.getUser().getUserId(),null,null);
     }
 
     /**
@@ -191,14 +191,16 @@ public class WithdrawalLogic {
      * @param workerId
      * @return
      */
-    public SettlementAmountBean totalAmount(String workerId,String websitId,List<SettlementOrder> list){
+    public SettlementAmountBean totalAmount(String userId,String websitId,List<SettlementOrder> list){
 
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         if(CollectionUtils.isEmpty(list)) {
             list = settlementOrderService.lambdaQuery()
                     //.eq(SettlementOrder::getStatus, SettlementStatusEnum.WAIT_ING.getKey())
                     .eq(SettlementOrder::getPayType, PayTypeEnum.WECHAT.getKey())
-                    .eq(SettlementOrder::getUserId, currentCompanyWechat.getUserId()).list();
+                    .and(item -> item.eq(SettlementOrder::getUserId, currentCompanyWechat.getUserId()).or(!StringUtils.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()))
+                            .eq(!StringUtils.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),SettlementOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                    ).list();
         }
         if(StringUtils.isNotBlank(websitId)){
             list = list.stream().filter(v -> StringUtils.equals(websitId,v.getWebsitId())).collect(Collectors.toList());

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -464,6 +464,7 @@ public class PayOrderLogic {
 
         workerOrder.setPayTime(new Date());
         workerOrder.setPayType(payType);
+        workerOrder.setUserId(currentCompanyWechat.getUserId());
         workerOrder.setPayStatus(PayStatusEnum.PAID.getKey());
         workerOrder.updateById();
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -96,6 +96,10 @@ public class WorkerLogic {
                             .eq(WorkerPolicy::getPolicyType,"AC")
                             .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                             .count() < 1
+
+                    &&
+                    policyOrderService.lambdaQuery().eq(PolicyOrder::getIsPay,IsYesNoEnum.YES.getKey())
+                    .eq(PolicyOrder::getWebsitUserId,websitUser.getId()).count() < 1
             ) {
 
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
@@ -151,15 +155,10 @@ public class WorkerLogic {
                     workerRemind.setRemindIn(2);
                     workerRemind.setEndTime(workerPolicy.getEndTime());
                     workerReminds.add(workerRemind);
+
+                    workerPolicy.setExTime(DateUtil.endOfDay(new Date())).updateById();
                 }
 
-                workerPolicyService.lambdaUpdate()
-                        .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                        .in(WorkerPolicy::getStatus,"YSX")
-                        .notIn(WorkerPolicy::getStatus,"DSX","BZZ")
-                        .eq(WorkerPolicy::getPolicyType,"AC")
-                        .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
-                        .set(WorkerPolicy::getExTime,DateUtil.endOfDay(new Date())).update();
             }
 
             // 意外险失效，没有购买的意外险

mall-server-api/src/main/java/com/gree/mall/manager/controller/policy/MailboxController.java

@@ -152,4 +152,18 @@ public class MailboxController {
         return ResponseHelper.success();
     }
 
+    @ApiOperation(value = "测试过期提醒")
+    @PostMapping("task6")
+    public ResponseHelper task6() throws IOException, MessagingException {
+        agreementLogic.task6();
+        return ResponseHelper.success();
+    }
+
+    @ApiOperation(value = "测试过期提醒")
+    @PostMapping("task7")
+    public ResponseHelper task7() throws IOException, MessagingException {
+        agreementLogic.task7();
+        return ResponseHelper.success();
+    }
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -800,7 +800,7 @@ public class AgreementLogic {
             if ((user.getHightExamineTime() != null && user.getHightExamineTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
             ){
 
-                remark = remark+"高空证"+DateUtil.format(user.getEndTime(),"yyyy-MM-dd");
+                remark = remark+"高空证"+DateUtil.format(user.getHightExamineTime(),"yyyy-MM-dd");
             }
 
 
@@ -1066,12 +1066,13 @@ public class AgreementLogic {
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
             if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderInStutasEnum.DGM.getKey())
+                    .eq(PolicyOrder::getWebsitUserId,workerPolicy.getWebsitUserId())
                     .eq(PolicyOrder::getType,"IN").count() > 0) {
                 continue;
             }
 
             AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
-            WebsitUser websitUser = websitUserService.getById(workerPolicy.getId());
+            WebsitUser websitUser = websitUserService.getById(workerPolicy.getWebsitUserId());
             User user = userService.getById(websitUser.getUserId());
 
             SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, adminWebsit.getInsureSteadUnit())
@@ -1120,18 +1121,16 @@ public class AgreementLogic {
 
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
-            if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderInStutasEnum.DGM.getKey())
+            if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey())
+                    .eq(PolicyOrder::getWebsitUserId,workerPolicy.getWebsitUserId())
                     .eq(PolicyOrder::getType,"EM").count() > 0) {
                 continue;
             }
 
             AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
-            WebsitUser websitUser = websitUserService.getById(workerPolicy.getId());
+            WebsitUser websitUser = websitUserService.getById(workerPolicy.getWebsitUserId());
             User user = userService.getById(websitUser.getUserId());
 
-            SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, adminWebsit.getInsureSteadUnit())
-                    .eq(SysDictCompany::getDictType,"INSURE_STEAD_UNIT").one();
-
 
             PolicyOrder policyOrder = new PolicyOrder();
             policyOrder.setBelongCompany(adminWebsit.getBelongCompany());
@@ -1148,10 +1147,6 @@ public class AgreementLogic {
             policyOrder.setWorkerName(user.getNickName());
             policyOrder.setWorkerIdcard(user.getIdCard());
             policyOrder.setWorkerMobile(user.getMobile());
-            policyOrder.setBuyUnitId(adminWebsit.getInsureSteadUnit());
-            policyOrder.setBuyUnit(sysDictCompany.getDictValue());
-            policyOrder.setCompany(sysDictCompany.getDictValue());
-
             policyOrder.setWebsitUserId(websitUser.getId());
             policyOrder.setType("EM");
             policyOrder.insert();