督导提交

common/pom.xml

@@ -66,7 +66,11 @@
             <artifactId>easyexcel</artifactId>
             <version>1.1.2-beta4</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.2</version>
+        </dependency>
         <dependency>
             <groupId>net.sf.json-lib</groupId>
             <artifactId>json-lib</artifactId>

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -408,7 +408,6 @@ public class PackageNewClothes {
         order.setUserSchool(userSchool);
         order.setHehuorenId(partner);
         order.setXbType(1);
-        order.setXbType(1);
         if(StringUtils.isNotBlank(site)){
             order.setSite(site);
         }

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

-/*
 package com.winsun.TimingTask;
 
 import com.alibaba.fastjson.JSON;
@@ -46,21 +45,23 @@ public class OrderTask {
         List<Order> orders = orderMapper.selectList(wrapper);
         orders.forEach(order -> {
             try {
+                Map<String, Object> dataMapping = new HashMap<>();
                 JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
-                log.info(jsonObject.toJSONString());
                 String dataArray = jsonObject.getString("dataArray");
                 Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class);
+                Wrapper<Order> wrapper1 = new EntityWrapper();
+                wrapper1.eq("xb_order_id",Map.get("orderCode"));
+                wrapper1.eq("id",order.getId());
                 if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13") ||
                         Map.get("orderState").toString().equals("8") || Map.get("orderState").toString().equals("22") ||
                         Map.get("orderState").toString().equals("21") ){
-                    Wrapper<Order> wrapper1 = new EntityWrapper();
-                    wrapper1.eq("xb_order_id",Map.get("orderCode"));
-                    wrapper1.eq("id",order.getId());
-                    Map<String, Object> dataMapping = new HashMap<>();
                     dataMapping.put("order_status", "待处理");
-                    orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
-                    log.info(order.getXbOrderId()+"订单已更新");
                 }
+                if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){
+                    dataMapping.put("order_status", "异常单");
+                }
+                orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
+                log.info(order.getXbOrderId()+"订单已更新");
             } catch (Exception e) {
                 log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
             }
@@ -74,15 +75,18 @@ public class OrderTask {
                 JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
                 String dataArray = jsonObject.getString("dataArray");
                 Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class);
+                Wrapper<Order> wrapper1 = new EntityWrapper();
+                wrapper1.eq("xb_order_id",Map.get("orderCode"));
+                wrapper1.eq("id",order.getId());
+                Map<String, Object> dataMapping = new HashMap<>();
                 if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13")){
-                    Wrapper<Order> wrapper1 = new EntityWrapper();
-                    wrapper1.eq("xb_order_id",Map.get("orderCode"));
-                    wrapper1.eq("id",order.getId());
-                    Map<String, Object> dataMapping = new HashMap<>();
                     dataMapping.put("order_status", "已完成");
-                    orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
-                     log.info(order.getXbOrderId()+"订单已更新");
                 }
+                if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){
+                    dataMapping.put("order_status", "异常单");
+                }
+                orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
+                log.info(order.getXbOrderId()+"订单已更新");
             } catch (Exception e) {
                 log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
             }
@@ -90,4 +94,4 @@ public class OrderTask {
 
     }
 
-}*/
+}