‘linchangsheng’ 7 months ago
parent
commit
6162a325f0

+ 12 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/WorkerController.java

@@ -8,6 +8,7 @@ import com.gree.mall.miniapp.bean.policy.PolicyOrderDetail;
 import com.gree.mall.miniapp.bean.policy.WorkerRemind;
 import com.gree.mall.miniapp.helper.ResponseHelper;
 import com.gree.mall.miniapp.logic.policy.WorkerLogic;
+import com.gree.mall.miniapp.plus.entity.Agreement;
 import com.gree.mall.miniapp.plus.entity.Policy;
 import com.gree.mall.miniapp.plus.entity.PolicyOrder;
 import com.gree.mall.miniapp.plus.entity.WorkerPolicy;
@@ -63,6 +64,17 @@ public class WorkerController {
     }
 
 
+    @PostMapping("/agreement")
+    @ApiOperation("保险协议配置详情")
+    public ResponseHelper<Agreement> agreement(
+            @ApiParam(value = "id", required = true) @RequestParam String id,
+            HttpServletRequest request
+    ) throws ParseException {
+        Agreement agreementDetail = workerLogic.agreement(id);
+        return ResponseHelper.success(agreementDetail);
+    }
+
+
     @PostMapping("/policy")
     @ApiOperation("购买意外保险")
     public ResponseHelper<Page<Policy>> policy(

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

@@ -373,4 +373,10 @@ public class WorkerLogic {
 
         return payDetail;
     }
+
+    public Agreement agreement(String id) {
+        Agreement agreement = agreementService.getById(id);
+
+        return agreement;
+    }
 }

+ 3 - 3
mall-server-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java

@@ -27,10 +27,10 @@ public class SyncOrderInfoLogic {
     private  String greeUrl;
 
     public void syncGuang() {
+/*
+        itfGreeSynRuleService.lambdaQuery()
 
-
-
- /*       String body = HttpRequest.post(greeUrl+ Constant.gree.GET_UPDATE_ORDERS)
+        String body = HttpRequest.post(greeUrl+ Constant.gree.GET_UPDATE_ORDERS+)
                 .header("key", jiaxianKey)
                 .header("sign", getSign())
                 .execute().body();*/

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

@@ -659,7 +659,7 @@ public class AgreementLogic {
                         .in(WorkerPolicy::getOrderId,policyOrderId)
                         .le(WorkerPolicy::getStartTime,new Date())
                         .ge(WorkerPolicy::getEndTime,new Date())
-                        .set(WorkerPolicy::getStatus, "ON").update();
+                        .set(WorkerPolicy::getStatus, "BZZ").update();
 
             }
         }
@@ -705,7 +705,7 @@ public class AgreementLogic {
                     workerPolicy.setOrderId(policyOrder.getId());
                     workerPolicy.setPolicyOrder(policyOrder.getPolicyId());
                     workerPolicy.setPolicyType(policyOrder.getType());
-                    workerPolicy.setStatus(WorkerPolicyStatusEnum.WAIT_ON.getKey());
+                    workerPolicy.setStatus(PolicyOrderEmStutasEnum.DSX.getKey());
                     workerPolicy.setStartTime(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(),1)));
                     workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.offsetMonth(new Date(),12)));
                     workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());