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

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

@@ -123,7 +123,7 @@ public class PolicyOrderLogic {
                 workerPolicy.setPolicyType("IN");
                 workerPolicy.setStartTime(DateUtil.parse((String) row.get(9), "yyyy-MM-dd"));
                 workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(10), "yyyy-MM-dd")));
-                workerPolicy.setWebsitUserId(policyOrder.getId());
+
                 workerPolicy.setWebsitId(policyOrder.getWebsitId());
                 workerPolicy.setWebsitName(policyOrder.getWebsitName());
                 workerPolicy.setWorkerName(policyOrder.getWorkerName());
@@ -222,8 +222,8 @@ public class PolicyOrderLogic {
             workerPolicy.setCompany(policyOrder.getBelongCompany());
             workerPolicy.setPolicyOrder(policyOrder.getPolicyNumber());
             workerPolicy.setPolicyType("LINE");
-            workerPolicy.setStartTime(DateUtil.parse((String) row.get(9), "yyyy-MM-dd"));
-            workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(10), "yyyy-MM-dd")));
+            workerPolicy.setStartTime(DateUtil.parse((String) row.get(6), "yyyy-MM-dd"));
+            workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(7), "yyyy-MM-dd")));
             workerPolicy.setWebsitUserId(policyOrder.getId());
             workerPolicy.setWebsitId(policyOrder.getWebsitId());
             workerPolicy.setWebsitName(policyOrder.getWebsitName());

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -424,11 +424,12 @@ public class SettlementOrderLogic {
                 this.addManualSettlementOrder(workerOrder, workerOrderItems);
                 this.addSettlementManaulWorker(workerOrder, workerOrderItems);
             }
+            //todo 辅材扣除
 /*
 
 
 
-            //todo 辅材扣除
+
 
             //插入使用记录
             this.addNormRecord(workerOrder, workerOrderItems);