‘linchangsheng’ 7 months ago
parent
commit
b7915445ef

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

@@ -604,7 +604,7 @@ public class AgreementLogic {
                             startTime = policy.getStartTime();
 
 
-                        policyOrder.setStartTime(startTime);
+                        policyOrder.setStartTime(DateUtil.beginOfDay(startTime));
                         policyOrder.setEndTime(policy.getEndTime());
 
                         if (new Date().after(policyOrder.getStartTime()))
@@ -700,37 +700,6 @@ public class AgreementLogic {
                             .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.DSX.getKey()).update();
 
 
-                    List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery().in(PolicyOrder::getId, policyOrderId).list();
-
-
-                    List<WorkerPolicy> workerPolicies = new ArrayList<>();
-
-                    for (PolicyOrder policyOrder : policyOrders) {
-                        workerPolicyService.lambdaUpdate().eq(WorkerPolicy::getOrderId,policyOrder.getId()).remove();
-                        WorkerPolicy workerPolicy = new WorkerPolicy();
-                        workerPolicy.setWorkerId(policyOrder.getWorkerNumber());
-                        workerPolicy.setType("IN");
-                        workerPolicy.setPolicyName(policyOrder.getPolicyName());
-                        workerPolicy.setOrderId(policyOrder.getId());
-                        workerPolicy.setPolicyOrder(policyOrder.getPolicyId());
-                        workerPolicy.setPolicyType(policyOrder.getType());
-                        workerPolicy.setStatus(PolicyOrderEmStutasEnum.DSX.getKey());
-                        workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
-                        workerPolicy.setWebsitId(policyOrder.getWebsitId());
-                        workerPolicy.setWebsitName(policyOrder.getWebsitName());
-                        workerPolicy.setWorkerName(policyOrder.getWorkerName());
-                        workerPolicy.setWorkerName(policyOrder.getWorkerName());
-                        workerPolicy.setCompany(policyOrder.getCompany());
-
-                        if (new Date().after(workerPolicy.getStartTime()))
-                            workerPolicy.setStatus("BZZ");
-                        else
-                            workerPolicy.setStatus("DSX");
-
-                        workerPolicies.add(workerPolicy);
-                    }
-                    workerPolicyService.saveBatch(workerPolicies);
-
                 }