存销售清单

common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml

@@ -190,8 +190,11 @@
         select * from hhr_order where order_status !='异常单' and  net_number = #{accountNumber}
     </select>
 
+    <select id="selectCompleteOrder" resultType="com.winsun.bean.Order">
+        select * from hhr_order WHERE WHERE order_status='已发货' AND TO_DAYS(NOW()) - TO_DAYS(create_time) > 7
+    </select>
     <update id="updateCompleteOrder">
-        UPDATE hhr_order SET order_status = '已完成' WHERE id IN (SELECT id FROM(SELECT id FROM hhr_order WHERE order_status='已发货' AND TO_DAYS(NOW()) - TO_DAYS(create_time) > 7) t1)
+        UPDATE hhr_order SET order_status = '已完成' WHERE order_status='已发货' AND TO_DAYS(NOW()) - TO_DAYS(create_time) > 7
     </update>
 
     <select id="selectKdOrder" parameterType="String" resultType="HashMap">

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -1155,6 +1155,8 @@ public class OrderController extends BaseController {
                 successTime = null;
             } else {
                 orderStatus = "已完成";
+                // 存销售清单 todo
+                insertCompleteOrder(order);
             }
             if ("快递".equals(map.get("b").toString())) {
                 company = map.get("c").toString();
@@ -1480,6 +1482,7 @@ public class OrderController extends BaseController {
         }
         int number = 0;
         Integer integer = 0;
+
         for (int i = 1; i < listMap.size(); i++) {
             integer = 0;
             Map<String, Object> map = listMap.get(i);
@@ -1507,7 +1510,7 @@ public class OrderController extends BaseController {
                 dataOrder.setAcceptResult("受理失败");
             }
             SalesList sales = new SalesList();
-
+            SysUser sysUser = sysUserMapper.selectById(orderByNumber.get(0).getHehuorenId());
 
             try {
                 integer = orderMapper.update(dataOrder,wrapper);
@@ -1521,7 +1524,7 @@ public class OrderController extends BaseController {
                 sales.setOrderPhone(businessNumber);
                 sales.setUserId(orderByNumber.get(0).getHehuorenId());
                 sales.setName(orderByNumber.get(0).getHehuorenName());
-                sales.setAccount(user.getAccount());
+                sales.setAccount(sysUser.getAccount());
                 sales.setCreateTime(date);
                 sales.setStatus("5");
                 sales.setRemark("批量受理："+orderStatus);
@@ -2164,6 +2167,8 @@ public class OrderController extends BaseController {
 
         }else if(packageInfo.getIsXbCard() == 1){
             order.setOrderStatus("已完成");
+            //存销售清单
+            insertCompleteOrder(databaseOrder);
             if ("1".equals(databaseOrder.getUserType())) {
                 order.setOrderStatus("待受理");
             }
@@ -2183,4 +2188,29 @@ public class OrderController extends BaseController {
         SendSmsAndMail.sendSms2(databaseOrder.getContactNumber(), company, kuaidiOrder, "11");
         return ResponseData.success();
     }
+    // 新用户完成存销售清单
+    public void insertCompleteOrder(Order order){
+        try{
+            SysUser sysUser = sysUserMapper.selectById(order.getHehuorenId());
+            Date date = new Date();
+            SalesList salesOrder = new SalesList();
+            salesOrder.setOrderPhone(order.getBusinessNumber());
+            salesOrder.setUserId(order.getHehuorenId());
+            salesOrder.setSalesSchool(order.getHehuorenSchool());
+            salesOrder.setCreateTime(date);
+            salesOrder.setStatus("1");
+            salesOrder.setSalesSubst(order.getHehuorenArea());
+            salesOrder.setName(order.getHehuorenName());
+            salesOrder.setOrderType(order.getUserType());
+            salesOrder.setOrderNum(order.getOrderNumber());
+            salesOrder.setOldCombo(order.getKapin());
+            salesOrder.setDelFlag("0");
+            salesOrder.setLockState("否");
+            log.info("新用户完成存销售清单:"+salesOrder);
+            salesOrder.setAccount(sysUser.getAccount());
+            salesListMapper.insert(salesOrder);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

task/src/main/java/com/winsun/TimingTask/OrderTask.java

@@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsun.bean.Order;
 import com.winsun.bean.OrderHistory;
+import com.winsun.bean.SalesList;
+import com.winsun.bean.SysUser;
 import com.winsun.mapper.OrderHistoryMapper;
 import com.winsun.mapper.OrderMapper;
+import com.winsun.mapper.SalesListMapper;
+import com.winsun.mapper.SysUserMapper;
 import com.winsun.outSideSystem.IntelligenceSendOrder;
 import com.winsun.smsUtils.SendSmsAndMail;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
@@ -41,6 +45,12 @@ public class OrderTask {
     private OrderHistoryMapper orderHistoryMapper;
 
     @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private SalesListMapper salesListMapper;
+
+    @Autowired
     public OrderTask(OrderMapper orderMapper) {
         OrderTask.orderMapper = orderMapper;
     }
@@ -202,7 +212,7 @@ public class OrderTask {
 
         Wrapper<Order> wrapper2 = new EntityWrapper();
         wrapper2.eq("order_status", "待活体");
-        List<Order> orders1 = orderMapper.selectList(wrapper);
+        List<Order> orders1 = orderMapper.selectList(wrapper2);
         orders1.forEach(order -> {
             try {
                 JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
@@ -214,6 +224,8 @@ public class OrderTask {
                 Map<String, Object> dataMapping = new HashMap<>();
                 if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13")){
                     dataMapping.put("order_status", "已完成");
+                    // 存销售清单
+                    insertCompleteOrder(order);
                 }
                 if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){
                     dataMapping.put("order_status", "异常单");
@@ -227,5 +239,29 @@ public class OrderTask {
         });
 
     }
-
+    // 新用户完成存销售清单
+    public void insertCompleteOrder(Order order){
+        try{
+            SysUser sysUser = sysUserMapper.selectById(order.getHehuorenId());
+            Date date = new Date();
+            SalesList salesOrder = new SalesList();
+            salesOrder.setOrderPhone(order.getBusinessNumber());
+            salesOrder.setUserId(order.getHehuorenId());
+            salesOrder.setSalesSchool(order.getHehuorenSchool());
+            salesOrder.setCreateTime(date);
+            salesOrder.setStatus("1");
+            salesOrder.setSalesSubst(order.getHehuorenArea());
+            salesOrder.setName(order.getHehuorenName());
+            salesOrder.setAccount(sysUser.getAccount());
+            salesOrder.setOrderType(order.getUserType());
+            salesOrder.setOrderNum(order.getOrderNumber());
+            salesOrder.setOldCombo(order.getKapin());
+            salesOrder.setDelFlag("0");
+            salesOrder.setLockState("否");
+            log.info("新用户完成存销售清单："+salesOrder);
+            salesListMapper.insert(salesOrder);
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+    }
 }

task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java

@@ -94,9 +94,27 @@ public class RhZhiNenTask {
             now.set(Calendar.MINUTE, 0);
             now.set(Calendar.SECOND, 0);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            /**
+             * update hhr_order set order_status = "待受理",remarks="融合时间已过当前时间"
+             * where rh_time < #{now} and order_status = "未下单"
+             *
+             */
+//            Wrapper<Order> orderWrapper = new EntityWrapper<>();
+//            orderWrapper.eq("order_status","未下单");
+//            orderWrapper.lt("rh_time",sdf.format(now.getTime()));
+//
+//            List<Order> list = orderMapper.selectList(orderWrapper);
+//            list.forEach(order -> {
+//
+//            });
+//
+//            Order order = new Order();
+//            order.setOrderStatus("待受理");
+//            order.setRemarks("融合时间已过当前时间");
+//            int updateNum = orderMapper.update(order,orderWrapper);
+             int updateNum = orderMapper.updateNosendAndRhTimeLtNowOrder(sdf.format(now.getTime()));
 
 
-            int updateNum = orderMapper.updateNosendAndRhTimeLtNowOrder(sdf.format(now.getTime()));
             log.info("更新待受理订单数：" + updateNum);
             Calendar calendar = Calendar.getInstance();
             // 查询未下单并且融合时间为今天的订单