Skip to content

G
gdtel-gztel-school-center
Commit f262fd5f by 黄森林
Options

督导提交

parent 2247aaeb
Showing with 24 additions and 17 deletions
common/pom.xml
...@@ -66,7 +66,11 @@ ...@@ -66,7 +66,11 @@
<artifactId>easyexcel</artifactId> <artifactId>easyexcel</artifactId>
<version>1.1.2-beta4</version> <version>1.1.2-beta4</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.2</version>
</dependency>
<dependency> <dependency>
<groupId>net.sf.json-lib</groupId> <groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId> <artifactId>json-lib</artifactId>
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -408,7 +408,6 @@ public class PackageNewClothes { ...@@ -408,7 +408,6 @@ public class PackageNewClothes {
order.setUserSchool(userSchool); order.setUserSchool(userSchool);
order.setHehuorenId(partner); order.setHehuorenId(partner);
order.setXbType(1); order.setXbType(1);
order.setXbType(1);
if(StringUtils.isNotBlank(site)){ if(StringUtils.isNotBlank(site)){
order.setSite(site); order.setSite(site);
} }
......
task/src/main/java/com/winsun/TimingTask/OrderTask.java
/*
package com.winsun.TimingTask; package com.winsun.TimingTask;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -46,21 +45,23 @@ public class OrderTask { ...@@ -46,21 +45,23 @@ public class OrderTask {
List<Order> orders = orderMapper.selectList(wrapper); List<Order> orders = orderMapper.selectList(wrapper);
orders.forEach(order -> { orders.forEach(order -> {
try { try {
Map<String, Object> dataMapping = new HashMap<>();
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId()); JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
log.info(jsonObject.toJSONString());
String dataArray = jsonObject.getString("dataArray"); String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class); 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") || 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("8") || Map.get("orderState").toString().equals("22") ||
Map.get("orderState").toString().equals("21") ){ 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", "待处理"); 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) { } catch (Exception e) {
log.info(order.getXbOrderId()+"订单更新失败",e.getMessage()); log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
} }
...@@ -74,15 +75,18 @@ public class OrderTask { ...@@ -74,15 +75,18 @@ public class OrderTask {
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId()); JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
String dataArray = jsonObject.getString("dataArray"); String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class); 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")){ 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", "已完成"); 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) { } catch (Exception e) {
log.info(order.getXbOrderId()+"订单更新失败",e.getMessage()); log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
} }
...@@ -90,4 +94,4 @@ public class OrderTask { ...@@ -90,4 +94,4 @@ public class OrderTask {
} }
}*/ }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment