Ver código fonte

【怡海能达商城对接】【ERPUU调整】

chenw 6 anos atrás
pai
commit
0b2022a904

+ 3 - 3
src/main/java/com/uas/erp/schedular/diymall/domain/Order.java

@@ -45,13 +45,13 @@ public class Order {
     OrderExpress orderExpress; // 订单物流信息
     List<OrderTimeAxis> orderTimeAxis; //订单时间轴
     SellerDueBank sellerDueBank; // 商家收款信息
-    private int erpEnuu;        //erp-客户或供应商enuu
+    private Integer erpEnuu;        //erp-客户或供应商enuu
 
-    public int getErpEnuu() {
+    public Integer getErpEnuu() {
         return erpEnuu;
     }
 
-    public void setErpEnuu(int erpEnuu) {
+    public void setErpEnuu(Integer erpEnuu) {
         this.erpEnuu = erpEnuu;
     }
 

+ 3 - 0
src/main/java/com/uas/erp/schedular/mall/task/OrderTask.java

@@ -366,6 +366,9 @@ public class OrderTask extends AbstractTask {
                         + "pu_paymentscode,pu_payments,pu_buyercode,pu_buyername,pu_departmentcode,pu_departmentname,pu_shipaddresscode,pu_pocode,pu_status,pu_statuscode,"
                         + "pu_recordman,pu_indate,pu_auditman,pu_auditdate,pu_getprice,pu_isadvance,PU_SENDSTATUS) values(?,?,sysdate,'代运营订单','RMB','1',?,?,?,?,?,?,?,?,'ADMIN','管理员','B15','优软云运营组',?,?,'已审核','AUDITED','ADMIN',sysdate,'ADMIN',sysdate,'0','unadvance','已上传')";
         //供应商资料生成逻辑
+        if (order.getErpEnuu() == null || order.getErpEnuu() == 0) {
+            return false;
+        }
         Vendor vendor = getVendorByUUOrName(order.getCode(), order.getErpEnuu());
         if (null == vendor) {
             return false;