调整订单创建接口，避免出现空地址或者空开票信息的情况

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -164,7 +164,9 @@ public class Order extends Controller {
         }
         Rows enterprisefinancerows = dbConnect.runSqlQuery("select * from sys_enterprise_finance where sys_enterprise_financeid="+sys_enterprise_financeid);
         sqlFactory.addParameter("sys_enterprise_financeid", sys_enterprise_financeid);
-
+        if(StringUtils.isBlank(content.getStringValue("invoicename"))){
+            return getErrReturnObject().setErrMsg("请联系总部公司提交开票信息").toString();
+        }
         sqlFactory.addParameter("invoicetaxno", content.getStringValue("invoicetaxno"));
         sqlFactory.addParameter("invoicename",content.getStringValue("invoicename"));
         sqlFactory.addParameter("invoiceaddress", content.getStringValue("invoiceaddress"));
@@ -179,6 +181,9 @@ public class Order extends Controller {
         }
         sqlFactory.addParameter("rec_contactsid", rec_contactsid);
 //        Rows contactsrows = dbConnect.runSqlQuery("select * from sys_enterprise_contacts where contactsid="+rec_contactsid);
+        if(StringUtils.isBlank(content.getStringValue("name"))){
+            return getErrReturnObject().setErrMsg("请补充收货信息").toString();
+        }
         sqlFactory.addParameter("contact",content.getStringValue("name"));
         sqlFactory.addParameter("address",content.getStringValue("address"));
         sqlFactory.addParameter("phonenumber", content.getStringValue("phonenumber"));
@@ -450,9 +455,10 @@ public class Order extends Controller {
             sqlFactory.addParameter("invoicename", enterprisefinancerows.get(0).getString("enterprisename"));
             sqlFactory.addParameter("invoiceaddress", enterprisefinancerows.get(0).getString("address"));
         }else{
-            sqlFactory.addParameter("invoicetaxno", "");
-            sqlFactory.addParameter("invoicename", "");
-            sqlFactory.addParameter("invoiceaddress", "");
+            return getErrReturnObject().setErrMsg("请联系总部公司提交开票信息").toString();
+//            sqlFactory.addParameter("invoicetaxno", "");
+//            sqlFactory.addParameter("invoicename", "");
+//            sqlFactory.addParameter("invoiceaddress", "");
         }
         //物流公司档案ID
         //sqlFactory.addParameter("sa_logiscompid", content.getLongValue("sa_logiscompid"));
@@ -472,12 +478,13 @@ public class Order extends Controller {
             sqlFactory.addParameter("city", contactsrows.get(0).getString("city"));
             sqlFactory.addParameter("county", contactsrows.get(0).getString("county"));
         }else{
-            sqlFactory.addParameter("contact", "");
-            sqlFactory.addParameter("address", "");
-            sqlFactory.addParameter("phonenumber", "");
-            sqlFactory.addParameter("province", "");
-            sqlFactory.addParameter("city", "");
-            sqlFactory.addParameter("county", "");
+            return getErrReturnObject().setErrMsg("请补充收货信息").toString();
+//            sqlFactory.addParameter("contact", "");
+//            sqlFactory.addParameter("address", "");
+//            sqlFactory.addParameter("phonenumber", "");
+//            sqlFactory.addParameter("province", "");
+//            sqlFactory.addParameter("city", "");
+//            sqlFactory.addParameter("county", "");
         }
         //备注说明
         sqlFactory.addParameter("remarks", content.getStringValue("remarks"));
@@ -2194,6 +2201,14 @@ public class Order extends Controller {
             return getErrReturnObject().setErrMsg("订单不存在").toString();
         }
         Row row = rows.get(0);
+        if(StringUtils.isBlank(row.getString("invoicename"))){
+            return getErrReturnObject().setErrMsg("请联系总部公司提交开票信息").toString();
+        }
+        if(StringUtils.isBlank(row.getString("name"))){
+            return getErrReturnObject().setErrMsg("请补充收货信息").toString();
+        }
+
+
         String type = row.getString("type");
         String typemx = row.getString("typemx");
         ArrayList<String> sqllist = new ArrayList<>();