需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/workorder/ChangeOrderController.java

@@ -173,4 +173,13 @@ public class ChangeOrderController {
         return ResponseHelper.success(workerOrderDetail);
     }
 
+
+    @PostMapping("/dow")
+    @ApiOperation(value = "4.0总部下载")
+    public ResponseHelper dow(@ApiParam(value = "工单号id", required = true) @RequestParam String orderBaseId
+    ){
+        changeOrderLogic.dow(orderBaseId);
+        return ResponseHelper.success();
+    }
+
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/ChangeOrderLogic.java

@@ -671,4 +671,20 @@ public class ChangeOrderLogic {
                 .eq(WebsitSales::getProjectNo, id)
                 .update();
     }
+
+    public void dow(String orderBaseId) {
+
+        PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
+
+
+
+        ItfGreeSynDownloadRec itfGreeSynDownloadRec = new ItfGreeSynDownloadRec();
+        itfGreeSynDownloadRec.setSynReqTime(new Date());
+        itfGreeSynDownloadRec.setGreeStatSynStatus(0);
+        itfGreeSynDownloadRec.setSalesWebsitNumber(pgOrderBase.getSalesWebsitNumber());
+
+        itfGreeSynDownloadRec.setWorkOrderId(pgOrderBase.getId());
+        itfGreeSynDownloadRec.setUpdatedTimestamp(new Date());
+        itfGreeSynDownloadRec.insert();
+    }
 }

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

@@ -32,6 +32,7 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -70,6 +71,9 @@ public class WorkerManagerLogic {
     @Autowired
     CommonMapper commonMapper;
 
+    @Autowired
+    WorkerNumberCheckService workerNumberCheckService;
+
 
 
     public void stop(String id) {
@@ -1015,7 +1019,36 @@ public class WorkerManagerLogic {
 
     }
 
-    public void importData(List<Object> objects) {
+    public void importData(List<Object> datas) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        int index = 0;
+        List<WorkerNumberCheck> workerNumberChecks =new ArrayList<>();
+        for (Object o : datas) {
+            index++;
+            String errPrefix = "第" + index + "行";
+            List<Object> row = (List<Object>) o;
+
+
+            WorkerNumberCheck workerNumberCheck = new WorkerNumberCheck();
+
+            workerNumberCheck.setCompanyWechatId(adminUser.getCompanyWechatId());
+            workerNumberCheck.setCompanyWechatName(adminUser.getCompanyName());
+            workerNumberCheck.setWebsitId((String)row.get(0));
+            workerNumberCheck.setWebsitName((String)row.get(1));
+            workerNumberCheck.setWorkerNumberYun((String)row.get(2));
+            workerNumberCheck.setWorkerName((String)row.get(3));
+            workerNumberCheck.setWorkerPhoneYun((String)row.get(4));
+
+            WorkerNumberCheck workerNumberCheckUp = workerNumberCheckService.lambdaQuery().eq(WorkerNumberCheck::getWorkerNumberYun, workerNumberCheck.getWorkerNumberYun())
+                    .last("limit 1").one();
+
+            if (workerNumberCheckUp != null){
+                workerNumberCheck.setId(workerNumberCheckUp.getId());
+            }
+
+
+        }
 
+        workerNumberCheckService.saveOrUpdateBatch(workerNumberChecks);
     }
 }

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

@@ -840,6 +840,9 @@ public class SettlementOrderLogic {
             if (CollectionUtils.isEmpty(orderBaseIdWorker))
                 continue;
 
+            record.setZgds(pgOrderBaseList.size());
+            record.setSbzts(pgOrderBaseList.stream().mapToInt(PgOrderBase::getTotalNum).sum());
+
             List<WorkerOrder> workerOrderList = workerOrders.stream().filter(
                     item -> item.getWorkerNumber().equals(record.getWorkerNumber())
                             && item.getWebsitId().equals(record.getWebsitId())

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -1814,10 +1814,5 @@ public class OrderBaseLogic {
         itfGreeSynDownloadRec.insert();
     }
 
-    public IPage<OrderBaseVO> orderEsBaseList(WorkOrderZfireParam workOrderZfireParam) {
 
-
-
-        return new Page<>();
-    }
 }

mall-server-api/src/main/resources/mapper/WebsitSalesCMapper.xml

@@ -174,23 +174,21 @@
 
     <select id="pgOrderList" resultType="com.gree.mall.manager.bean.worker.SettlementPgOrderVO">
         SELECT
-        	d.belong_company,
-        	d.belong_company_code,
-        	d.websit_id,
-        	d.`name` as websit_name,
-        	d.link_name,
-        	d.link_mobile,
-        	a.worker_name,
-        	a.worker_number,
-        	a.worker_mobile,
-        	b.order_small_type_text,
-        	COUNT(b.id) as zgds,
-        	SUM(b.total_num) as sbzts
+        d.belong_company,
+        d.belong_company_code,
+        d.websit_id,
+        d.`name` as websit_name,
+        d.link_name,
+        d.link_mobile,
+        a.worker_name,
+        a.worker_number,
+        a.worker_mobile,
+        b.order_small_type_text
         FROM
-          pg_order_worker a
-        	JOIN admin_websit d on  a.websit_id = d.websit_id
-          JOIN pg_order_base b ON a.order_base_id = b.id and a.is_master = true   and b.order_status in ("YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
-          LEFT JOIN settlement_order c ON a.worker_number = c.worker_number
+        pg_order_worker a
+        JOIN admin_websit d on  a.websit_id = d.websit_id
+        JOIN pg_order_base b ON a.order_base_id = b.id and a.is_master = true   and b.order_status in ("YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
+        ${ex.query}
         <if test="overTime != null and overTime !=''">
             AND a.create_time between  #{overTime} and #{overEndTime}
         </if>