下载订单，增加销售统计。

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -486,6 +486,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Transactional
     public SalesOrder addOrderAndIteminfo(SalesOrder salesOrder, List<SalesOrderItem> list) {
         calculationTotal(salesOrder,list);
+        if (salesOrder.getSalesMainOrderId() != null) {
+            salesOrder.setSalesPayMoney(0);
+        }
 
         //添加订单数据
         int orderNum = salesOrderMapper.addSalesOrder(salesOrder);
@@ -765,6 +768,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 listSalesOrder.get(i).setSalesMainOrderId(mainOrder.getSalesId());
                 listSalesOrder.get(i).setSalesId(null);
                 calculationTotal(listSalesOrder.get(i),listSalesOrder.get(i).getSalesOrderItemList());
+                listSalesOrder.get(i).setSalesPayMoney(0);
                 res = salesOrderMapper.addSalesOrder(listSalesOrder.get(i));
                 if (res <= 0) {
                     throw  new RuntimeException("添加子订单出错");
@@ -1994,8 +1998,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 if(flag < 1){
                     throw new RuntimeException("删除订单项失败，订单交易号："+salesOrder.getSalesDealCode());
                 }
-
-                calculationTotal(null,salesOrder.getSalesOrderItemList());
+                //
+                orderList.get(0);
+                //calculationTotal(null,salesOrder.getSalesOrderItemList());
                 flag = salesOrderMapper.addOrderItemList(salesOrder.getSalesOrderItemList());
                 if(flag < 1){
                     throw new RuntimeException("添加订单项失败，订单交易号："+salesOrder.getSalesDealCode());
@@ -2295,7 +2300,6 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             salesAmount += (soi.getItemNum() * soi.getItemProductPrice());
             salesPayMoney += soi.getItemTotal();
         }
-
         if(salesOrder != null && salesOrder.getSalesStoreId() != 40){
             salesOrder.setSalesAmount(salesAmount);
             salesOrder.setSalesPayMoney(salesPayMoney);

watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderSyncLogServiceImpl.java

@@ -160,8 +160,14 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
     @Override
     @Transactional
     public synchronized Integer syncXYTOrder(Integer type,String sta,Date creatTime) {
+        SysConfig sysConfig = null;
         if(type == 1){
-            SysConfig sysConfig = sysConfigMapper.getSysConfigAllLock(CONFIG_ID);
+            sysConfig = sysConfigMapper.getSysConfigAllLock(CONFIG_ID);
+            if ("60".equals(sta)) {
+                sysConfig = sysConfigMapper.getSysConfigAllLock(15);
+            } else if ("70".equals(sta)) {
+                sysConfig = sysConfigMapper.getSysConfigAllLock(16);
+            }
             Date date = null;
             try {
                 date = SYS_CONFIG_SDF.parse(sysConfig.getConfigRemarks());
@@ -194,9 +200,18 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
         }else{
             startCreateTime =  sdf.format(creatTime);
         }
-        paramsMap.put("startCreateTime", startCreateTime);
         Date endCreateTime = new Date();
-        paramsMap.put("endCreateTime", sdf.format(endCreateTime));
+        if ("60".equals(sta)) {
+            paramsMap.put("startUpdateTime", sysConfig.getConfigRemarks());
+            paramsMap.put("endUpdateTime", sdf.format(endCreateTime));
+        } else if ("70".equals(sta)) {
+            paramsMap.put("startUpdateTime", sysConfig.getConfigRemarks());
+            paramsMap.put("endUpdateTime", sdf.format(endCreateTime));
+        } else {
+            // 待发货订单
+            paramsMap.put("startCreateTime", startCreateTime);
+            paramsMap.put("endCreateTime", sdf.format(endCreateTime));
+        }
         if(sta != null && !"".equals(sta)){
             paramsMap.put("orderStatus", sta);
         }
@@ -304,7 +319,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
             newConfigDate.set(Calendar.SECOND,0);
 
             SysConfig newSysConfig = new SysConfig();
-            newSysConfig.setConfigId(CONFIG_ID);
+            newSysConfig.setConfigId(sysConfig.getConfigId());
             newSysConfig.setConfigParameter("2");
             newSysConfig.setConfigRemarks(SYS_CONFIG_SDF.format(newConfigDate.getTime()));
             sysConfigMapper.updateSysConfig(newSysConfig);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -468,6 +468,10 @@ public class MQTask implements InitializingBean {
 		logger.info("-----定时拉取小亚通订单-开始----");
 		Integer num = orderSyncLogService.syncXYTOrder(1,"20",null);
 		logger.info("-----定时拉取小亚通订单,拉取订单数量："+ num +"-结束----");
+		logger.info("-----定时拉取小亚通已发货订单");
+		orderSyncLogService.syncXYTOrder(1,"60",null);
+		logger.info("-----定时拉取小亚通已签收订单");
+		orderSyncLogService.syncXYTOrder(1,"70",null);
 	}
 
 	/**

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -1289,6 +1289,7 @@ public class AwaitSendController {
         // 标题
         List<String> titles = new ArrayList<String>(26);
         titles.add("订单创建日期");
+        titles.add("订单支付日期");
         titles.add("订单编号");
         titles.add("交易号");
         titles.add("商家编号");
@@ -1314,12 +1315,14 @@ public class AwaitSendController {
         titles.add("是否出库");
         titles.add("出库日期");
         titles.add("发货仓库");
+        titles.add("所属主订单");
         model.put("titles", titles);
         List<List<Object>> countexts = new ArrayList<List<Object>>(temporarySalesOrderList.size());
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
         temporarySalesOrderList.forEach((salesOrder -> {
             List<Object> row = new ArrayList<Object>();
             row.add(salesOrder.getSalesCreateTime() == null ? null:formatter.format(salesOrder.getSalesCreateTime()));
+            row.add(salesOrder.getSalesPayTime() == null ? null:formatter.format(salesOrder.getSalesPayTime()));
             row.add(salesOrder.getSalesOrderId());
             row.add(salesOrder.getSalesDealCode());
             row.add(salesOrder.getSalesExOrderId());
@@ -1432,6 +1435,7 @@ public class AwaitSendController {
                 }
             }
             row.add(temp);
+            row.add(salesOrder.getSalesMainOrderId());
             countexts.add(row);
         }));
         model.put("varList", countexts);