订单发货物流方式逻辑优化

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

@@ -231,6 +231,13 @@ public class Order extends Controller {
                 sqlFactory.addParameter("sa_accountclassid", sa_accountclassid);
                 sqlList.addAll(updateAccountclassinfos(sa_orderid, sa_accountclassid, sys_enterpriseid));
             }
+            if(type.equals("标准订单")){
+                sqlFactory.addParameter("logisticsmethod", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("logisticsmethod"):agentRows.get(0).getString("delivery"));
+                sqlFactory.addParameter("delivery", "");
+            }else{
+                sqlFactory.addParameter("logisticsmethod", "");
+                sqlFactory.addParameter("delivery", "");
+            }
         } else {
             //订单更新时
             if (content.getLongValue("sa_accountclassid") != 0) {
@@ -262,6 +269,9 @@ public class Order extends Controller {
             } else {
                 sqlFactory.addParameter("billdate", billdate);
             }
+
+            sqlFactory.addParameter("delivery", content.getStringValue("delivery"));
+            sqlFactory.addParameter("logisticsmethod", content.getStringValue("logisticsmethod"));
         }
 
         sqlFactory.addParameter("rebate_userate", content.getBigDecimal("rebate_userate"));
@@ -275,8 +285,6 @@ public class Order extends Controller {
         sqlFactory.addParameter("projectnote", content.getStringValue("projectnote"));
         sqlFactory.addParameter("abstract", content.getStringValue("abstract"));
 
-        sqlFactory.addParameter("delivery", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("delivery"):agentRows.get(0).getString("delivery"));
-        sqlFactory.addParameter("logisticsmethod", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("delivery"):agentRows.get(0).getString("delivery"));
         sqlFactory.addParameter("tracknumber", content.getStringValue("tracknumber"));
         sqlFactory.addParameter("mailno", content.getStringValue("mailno"));
         sqlFactory.addParameter("submitphonenumber", content.getStringValue("submitphonenumber"));