购物车转订单bug修复

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

@@ -220,11 +220,11 @@ public class Order extends Controller {
 //        }
 
         //判断领域
-        String sql = "SELECT count(0) count from plm_item_tradefield WHERE tradefield='" + tradefield + "' and itemid in " + itemidids;
-        sql = sql.replace("[", "(").replace("]", ")");
-        if (dbConnect.runSqlQuery(sql).get(0).getLong("count") != itemidids.size()) {
+//        String sql = "SELECT count(0) count from plm_item_tradefield WHERE tradefield='" + tradefield + "' and itemid in " + itemidids;
+//        sql = sql.replace("[", "(").replace("]", ")");
+//        if (dbConnect.runSqlQuery(sql).get(0).getLong("count") != itemidids.size()) {
 //            return getErrReturnObject().setErrMsg("请添加同一领域的商品").toString();
-        }
+//        }
 
 
         //表名
@@ -322,7 +322,7 @@ public class Order extends Controller {
         ArrayList<String> sqlList = new ArrayList<>();
 
         //删除购物车中的数据
-        sql = "DELETE from sa_shoppingcart WHERE sys_enterpriseid = " + sys_enterpriseid + " and itemid in " + itemidids + " AND siteid ='" + siteid + "'";
+        String sql = "DELETE from sa_shoppingcart WHERE sys_enterpriseid = " + sys_enterpriseid + " and itemid in " + itemidids + " AND siteid ='" + siteid + "'";
         sql = sql.replace("[", "(").replace("]", ")");
         sqlList.add(sql);
 //        //清除多余的操作记录
@@ -685,7 +685,7 @@ public class Order extends Controller {
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
                 where.append(" and t1.billdate <='").append(whereObject.getString("enddate")).append("' ");
             }
-            
+
             if (whereObject.containsKey("writeoffstatus") && !"".equals(whereObject.getString("writeoffstatus"))) {
                 String writeoffstatus = whereObject.getStringValue("writeoffstatus");
                 if (writeoffstatus.equals("未核销")) {
@@ -1023,7 +1023,7 @@ public class Order extends Controller {
         dbConnect.runSqlUpdate(sqlList);
 
         sendMsg(message, sa_orderid, sys_enterpriseid);
-        Executor.sendEml(this, "ordercheck", sa_orderid,new ArrayList<>());
+        Executor.sendEml(this, "ordercheck", sa_orderid, new ArrayList<>());
         return getSucReturnObject().toString();
     }
 
@@ -1384,7 +1384,7 @@ public class Order extends Controller {
 
         sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, status, "订单" + status + "：" + amount).getSQL());
         dbConnect.runSqlUpdate(sqlList);
-        Executor.sendEml(this, "orderresponse", sa_orderid,new ArrayList<>());
+        Executor.sendEml(this, "orderresponse", sa_orderid, new ArrayList<>());
         return getSucReturnObject().toString();
     }
 
@@ -1501,31 +1501,31 @@ public class Order extends Controller {
     public void sendEmail(Long sa_orderid, Row row, Rows orderBrand) {
         switch (row.getString("tradefield")) {
             case "全领域":
-                Executor.sendEml(this, "ordertradefield", sa_orderid,new ArrayList<>());
+                Executor.sendEml(this, "ordertradefield", sa_orderid, new ArrayList<>());
                 break;
             case "燃气":
-                Executor.sendEml(this, "ordertradefieldrq", sa_orderid,new ArrayList<>());
+                Executor.sendEml(this, "ordertradefieldrq", sa_orderid, new ArrayList<>());
                 break;
             case "给水":
-                Executor.sendEml(this, "ordertradefieldgs", sa_orderid,new ArrayList<>());
+                Executor.sendEml(this, "ordertradefieldgs", sa_orderid, new ArrayList<>());
                 break;
             case "暖通":
-                Executor.sendEml(this, "ordertradefieldnt", sa_orderid,new ArrayList<>());
+                Executor.sendEml(this, "ordertradefieldnt", sa_orderid, new ArrayList<>());
                 break;
             case "消防":
-                Executor.sendEml(this, "ordertradefieldxf", sa_orderid,new ArrayList<>());
+                Executor.sendEml(this, "ordertradefieldxf", sa_orderid, new ArrayList<>());
                 break;
         }
         if (orderBrand.isNotEmpty()) {
             switch (orderBrand.get(0).getString("brandname")) {
                 case "全品牌":
-                    Executor.sendEml(this, "orderbrand", sa_orderid,new ArrayList<>());
+                    Executor.sendEml(this, "orderbrand", sa_orderid, new ArrayList<>());
                     break;
                 case "班尼戈":
-                    Executor.sendEml(this, "orderbrandbng", sa_orderid,new ArrayList<>());
+                    Executor.sendEml(this, "orderbrandbng", sa_orderid, new ArrayList<>());
                     break;
                 case "中捷":
-                    Executor.sendEml(this, "orderbrandzj", sa_orderid,new ArrayList<>());
+                    Executor.sendEml(this, "orderbrandzj", sa_orderid, new ArrayList<>());
                     break;
             }
         }