Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -212,6 +212,8 @@ public class IoOrderResponse {
 
     private String customerName;
 
+
+
     /**
      * 导出状态/上传状态（0.未导出，1.已导出，2.导出失败）
      */
@@ -253,4 +255,11 @@ public class IoOrderResponse {
             return fromInvName;
         return fromName;
     }
+
+    public Integer getExportStatus() {
+        if(exportStatus == null){
+            return 0;
+        }
+        return exportStatus;
+    }
 }

src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java

@@ -388,10 +388,15 @@ public class PlatformServiceImpl implements PlatformService {
             IoOrderEntity ioOrderEntity1=new IoOrderEntity();
             ioOrderEntity1.setFromSpmsOrders(formSpmsOrders);
             ioOrderEntity1.setBillNo(orderId);
+            ioOrderEntity1.setExportStatus(1);
             ioOrderService.updateByBillNo(ioOrderEntity1);
             return JSON.parseObject(resp, BaseResponse.class);
         } else {
             log.error("获取自助平台分库失败");
+            IoOrderEntity ioOrderEntity1=new IoOrderEntity();
+            ioOrderEntity1.setBillNo(orderId);
+            ioOrderEntity1.setExportStatus(2);
+            ioOrderService.updateByBillNo(ioOrderEntity1);
             return ResultVOUtils.error(500, "获取自助平台接口异常");
         }
     }