Commit d74996cd by 黄森林

智能平台推送信息接口优化

parent b3d259e4
......@@ -38,15 +38,6 @@ public class IntelligentPlatformPushController {
/**
* 智能平台推送信息接收
* 订单状态(转义后的状态)与智能平台受理状态对照表:
* 状态ID 状态名称 智能平台状态
* 6 待配送 待配送
* 7 物流配送中 物流配货中、物流配送中、重发配送【待跟进】、待分销商审核
* 8 配送成功 配送成功【待收费】
* 4 归档 归档
* 5 作废 作废、分销商作废
* 10 受理异常 受理异常
* 2 待受理 待撤单
*
* @param sign
* @param type
......@@ -77,8 +68,16 @@ public class IntelligentPlatformPushController {
Wrapper<Object> wrapper = new EntityWrapper<>();
wrapper.eq("order_id", signMap.get("orderNum"));
String status = signMap.get("status").toString();
String orderStatus= OrderStatus.findById(signMap.get("statusId").toString()).getName();
Integer num = orderViewMapper.IntelligentPlatformPush(wrapper, status,orderStatus);
String orderStatus = null;
try {
orderStatus = OrderStatus.findById(signMap.get("statusId").toString()).getName();
} catch (Exception e) {
resultMap.put("code", "12001");
resultMap.put("msg", "订单状态不存在");
log.error(e.getMessage(), e);
return resultMap;
}
Integer num = orderViewMapper.IntelligentPlatformPush(wrapper, status, orderStatus);
if (num > 0) {
if (type.equals("dkd") || type.equals("rh")) {
Wrapper<OrderView> wrapper1 = new EntityWrapper<>();
......@@ -111,7 +110,7 @@ public class IntelligentPlatformPushController {
return resultMap;
} else {
log.info("更新失败");
resultMap.put("code", "00001");
resultMap.put("code", "12001");
resultMap.put("msg", "智能平台订单号不能为空");
}
......
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