Forráskód Böngészése

订单提交时修复请”选择结算企业“bug

eganwu 1 éve
szülő
commit
c7882e58d3

+ 6 - 5
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1395,10 +1395,15 @@ public class Order extends Controller {
         if (sa_accountclassid <= 0) {
             return getErrReturnObject().setErrMsg("请选择支付账号").toString();
         }
+        Long sys_enterpriseid = row.getLong("sys_enterpriseid");
+        if (sys_enterpriseid <= 0) {
+            return getErrReturnObject().setErrMsg("请选择订货企业信息").toString();
+        }
         //验证结算企业
         Long pay_enterpriseid = row.getLong("pay_enterpriseid");
         if (pay_enterpriseid <= 0) {
-            return getErrReturnObject().setErrMsg("请选择结算企业").toString();
+            dbConnect.runSqlQuery("UPDATE sa_order set pay_enterpriseid=sys_enterpriseid  WHERE sa_orderid="+sa_orderid);
+//            return getErrReturnObject().setErrMsg("请选择结算企业").toString();
         }
         Long sys_enterprise_financeid = row.getLong("sys_enterprise_financeid");
         if (sys_enterprise_financeid <= 0) {
@@ -1409,10 +1414,6 @@ public class Order extends Controller {
 //        if (rec_contactsid <= 0) {
 //            return getErrReturnObject().setErrMsg("请选择物收货人信息").toString();
 //        }
-        Long sys_enterpriseid = row.getLong("sys_enterpriseid");
-        if (sys_enterpriseid <= 0) {
-            return getErrReturnObject().setErrMsg("请选择订货企业信息").toString();
-        }
         if (dbConnect.runSqlQuery("SELECT 1 FROM sa_agents WHERE siteid='" + siteid + "' AND `status`='启用' AND sys_enterpriseid=" + sys_enterpriseid).isEmpty()) {
             return getErrReturnObject().setErrMsg("当前企业不存在或已禁用,无法下单").toString();
         }