fixed 小程序订单自动上传发货信息

fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java

@@ -16,6 +16,7 @@ import com.fuint.common.enums.*;
 import com.fuint.common.http.HttpRESTDataClient;
 import com.fuint.common.service.*;
 import com.fuint.common.util.*;
+import com.fuint.common.vo.printer.OrderStatusType;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.web.ResponseObject;
 import com.fuint.repository.mapper.MtUploadShippingLogMapper;
@@ -1068,19 +1069,22 @@ public class WeixinServiceImpl implements WeixinService {
                 String response = HttpRESTDataClient.requestPostBody(url, reqJson);
                 logger.info("微信上传发货信息接口参数：{}，返回：{}", reqJson, response);
                 JSONObject data = (JSONObject) JSONObject.parse(response);
-
+                MtUploadShippingLog mtUploadShippingLog = new MtUploadShippingLog();
+                mtUploadShippingLog.setMerchantId(orderInfo.getMerchantId());
+                mtUploadShippingLog.setStoreId(orderInfo.getStoreId());
+                mtUploadShippingLog.setOrderId(orderInfo.getId());
+                mtUploadShippingLog.setOrderSn(orderSn);
+                mtUploadShippingLog.setMobile(orderInfo.getAddress().getMobile());
+                Date time = new Date();
+                mtUploadShippingLog.setCreateTime(time);
+                mtUploadShippingLog.setUpdateTime(time);
                 if (data.get("errcode").toString().equals("0")) {
                     logger.info("微信上传发货信息接口成功，订单号：", orderSn);
-                    MtUploadShippingLog mtUploadShippingLog = new MtUploadShippingLog();
-                    mtUploadShippingLog.setMerchantId(orderInfo.getMerchantId());
-                    mtUploadShippingLog.setStoreId(orderInfo.getStoreId());
-                    mtUploadShippingLog.setOrderId(orderInfo.getId());
-                    mtUploadShippingLog.setOrderSn(orderSn);
-                    mtUploadShippingLog.setStatus(StatusEnum.ENABLED.getKey());
-                    uploadShippingLogMapper.insert(mtUploadShippingLog);
+                    mtUploadShippingLog.setStatus(OrderStatusType.Completed.getVal());
                 } else {
-                    logger.error("微信上传发货信息接口失败，订单号：", orderSn);
+                    mtUploadShippingLog.setStatus(OrderStatusType.Failed.getVal());
                 }
+                uploadShippingLogMapper.insert(mtUploadShippingLog);
             } catch (Exception e) {
                 logger.error("微信上传发货信息接口失败：", e.getMessage());
             }

fuint-application/src/main/java/com/fuint/common/vo/printer/OrderStatusType.java

@@ -8,36 +8,24 @@ package com.fuint.common.vo.printer;
  */
 public enum OrderStatusType {
 
-    /**
-     * 处理中
-     */
-    Processing(0),
     /**
      * 完成
      */
-    Completed(1),
+    Completed("A"),
+
     /**
      * 失败
      */
-    Failed(2);
+    Failed("B");
 
-    private final int val;
+    private final String val;
 
-    public int getVal() {
+    public String getVal() {
         return val;
     }
 
-    OrderStatusType(int num) {
-        this.val = num;
-    }
-
-    public static OrderStatusType getOrderStatusType(int val) {
-        for (OrderStatusType type : OrderStatusType.values()) {
-            if (type.getVal() == val) {
-                return type;
-            }
-        }
-        return Processing;
+    OrderStatusType(String type) {
+        this.val = type;
     }
 
 }

fuint-application/src/main/java/com/fuint/module/schedule/UploadShippingInfoJob.java

@@ -43,7 +43,7 @@ public class UploadShippingInfoJob {
 
     @Scheduled(cron = "${uploadShippingInfoJob.job.time}")
     @Transactional(rollbackFor = Exception.class)
-    public void dealOrder() throws BusinessCheckException {
+    public void dealOrder() {
         String theSwitch = environment.getProperty("uploadShippingInfoJob.job.switch");
          if (theSwitch != null && theSwitch.equals("1")) {
             logger.info("uploadShippingInfoJobStart!!!");
@@ -52,7 +52,11 @@ public class UploadShippingInfoJob {
             List<UploadShippingLogBean> dataList = uploadShippingLogMapper.getUploadShippingLogList(0);
             if (dataList.size() > 0) {
                 for (UploadShippingLogBean bean : dataList) {
-                     weixinService.uploadShippingInfo(bean.getOrderSn());
+                    try {
+                        weixinService.uploadShippingInfo(bean.getOrderSn());
+                    } catch (BusinessCheckException e) {
+                        logger.error(e.getMessage());
+                    }
                 }
             }
             logger.info("uploadShippingInfoJobEnd!!!");