智能平台推送信息接收接口完成

common/src/main/java/com/winsun/constant/OrderStatus.java

@@ -12,11 +12,14 @@ import java.util.Map;
 public enum OrderStatus {
     //
     PENDINGSUBMISSION("1", "待提交"),
-    FILE("4", "归档"),
-    INVALID("5", "作废"),
-    ACCEPTANCESUCCESSFUL("3", "受理成功"),
+    FILE("4", "已完成"),
+    INVALID("5", "异常单"),
+    PENDINGDISTRIBUTION("6", "待配送"),
+    INLOGISTICSDISTRIBUTION("7", "已完成"),
+    SUCCESSFULDISTRIBUTION("8", "已完成"),
+    ACCEPTANCESUCCESSFUL("3", "已完成"),
     CHARGED("9", "已收费"),
-    ACCEPTEXCEPTCION("10", "受理异常"),
+    ACCEPTEXCEPTCION("10", "异常单"),
     PENDINGACCEPTANCE("2", "待受理"),
     NOTPAID("100", "未支付");
     OrderStatus(String id, String name) {

common/src/main/java/com/winsun/mapper/OrderViewMapper.java

@@ -3,11 +3,10 @@ package com.winsun.mapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsun.bean.OrderView;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Component;
 
+import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
 
@@ -21,4 +20,17 @@ public interface OrderViewMapper extends BaseMapper<OrderView> {
 
     @Select("<script>SELECT * FROM `order_view` <where> ${ew.sqlSegment} </where> </script>")
     List<Map<String, Object>> downloadOrderView(@Param("ew") Wrapper<OrderView> wrapper);
+
+    /**
+     * 智能平台推送接收
+     * @return
+     */
+    @Update("<script>UPDATE `hhr_order` set th_status = #{status},order_status = #{orderStatus} <where> ${ew.sqlSegment} </where> </script>")
+    Integer IntelligentPlatformPush(@Param("ew") Wrapper<Object> wrapper,@Param("status")String status,@Param("orderStatus")String orderStatus);
+
+    @Select("<script>SELECT id FROM `hhr_order` <where> ${ew.sqlSegment} </where> </script>")
+    String selectOrderId(@Param("ew") Wrapper<Object> wrapper);
+
+    @Insert("insert into`hhr_order_history`(order_id, status, create_date) values(#{id}, #{status}, #{createTime})")
+    int insertOrderHistory(@Param("id")String id,@Param("status")String status,@Param("createTime") Timestamp createTime);
 }

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

+package com.winsun.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.winsun.bean.OrderView;
+import com.winsun.constant.OrderStatus;
+import com.winsun.mapper.OrderViewMapper;
+import com.winsun.utils.MyBatisPlusUpdateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: chancy
+ * @Date: 2020/2/21 9:22
+ */
+
+@Slf4j
+@RestController
+@RequestMapping("/school_center")
+public class IntelligentPlatformPushController {
+
+    private static OrderViewMapper orderViewMapper;
+
+    @Autowired
+    public IntelligentPlatformPushController(OrderViewMapper orderViewMapper) {
+        IntelligentPlatformPushController.orderViewMapper = orderViewMapper;
+    }
+
+    /**
+     * 智能平台推送信息接收
+     * 订单状态（转义后的状态）与智能平台受理状态对照表：
+     * 状态ID	状态名称	智能平台状态
+     * 6	待配送	待配送
+     * 7	物流配送中	物流配货中、物流配送中、重发配送【待跟进】、待分销商审核
+     * 8	配送成功	配送成功【待收费】
+     * 4	归档	归档
+     * 5	作废	作废、分销商作废
+     * 10	受理异常	受理异常
+     * 2	待受理	待撤单
+     *
+     * @param sign
+     * @param type
+     * @param content
+     * @return dataType：
+     * 预付费 yff
+     * 单宽带 dkd
+     * 融合 rh
+     */
+    @RequestMapping(value = "/IntelligentPlatformPush/{dataType}/IntelligentPlatform")
+    @ResponseBody
+    public Map<String, Object> IntelligentPlatform(String sign, String type, String content) {
+        Map<String, Object> signMap = (Map<String, Object>) JSON.parse(content);
+        Map<String, Object> resultMap = new HashMap<>();
+        if (StringUtils.isEmpty(type)) {
+            log.info("业务类型不能为空---" + type + "---" + sign + "----" + content);
+            resultMap.put("code", "12001");
+            resultMap.put("msg", "业务类型不能为空");
+            return resultMap;
+        }
+        if (StringUtils.isEmpty(sign)) {
+            log.info("sign不能为空---" + type + "---" + sign + "----" + content);
+            resultMap.put("code", "12001");
+            resultMap.put("msg", "sign不能为空");
+            return resultMap;
+        }
+        if (signMap.get("orderNum") != null && StringUtils.isNotBlank(signMap.get("orderNum").toString())) {
+            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);
+            if (num > 0) {
+                if (type.equals("dkd") || type.equals("rh")) {
+                    Wrapper<OrderView> wrapper1 = new EntityWrapper<>();
+                    wrapper1.eq("orderSeqTHD", signMap.get("orderNum"));
+                    Map<String, Object> dataMapping = new HashMap<>();
+                    dataMapping.put("status", signMap.get("statusId"));
+                    try {
+                        orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
+                    } catch (Exception e) {
+                        log.error(e.getMessage(), e);
+                    }
+                }
+                log.info("更新成功！！！");
+                resultMap.put("code", "000001");
+                resultMap.put("msg", "消息接收成功");
+            } else {
+                log.info("更新失败");
+                resultMap.put("code", "00001");
+                resultMap.put("msg", "消息接收成功更新失败");
+
+            }
+            String id = orderViewMapper.selectOrderId(wrapper);
+            Date date = new Date();
+            Timestamp createTime = new Timestamp(date.getTime());
+            try {
+                orderViewMapper.insertOrderHistory(id, status, createTime);
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+            }
+            return resultMap;
+        } else {
+            log.info("更新失败");
+            resultMap.put("code", "00001");
+            resultMap.put("msg", "智能平台订单号不能为空");
+
+        }
+        return resultMap;
+    }
+}

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

@@ -10,7 +10,6 @@ import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.util.IOUtils;
 import com.winsun.bean.OrderView;
-import com.winsun.bean.UniversityInfo;
 import com.winsun.constant.OrderStatus;
 import com.winsun.mapper.OrderViewMapper;
 import lombok.extern.slf4j.Slf4j;