新增商品时返回版本号

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

@@ -140,7 +140,7 @@ public class OrderItems extends Controller {
                     sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "订单商品【" + itemRow.getString("itemname") + "】由单价:" + price1 + "修改为单价:" + price, "订单修改单价").getSQL());
                 }
             }
-            if(price.compareTo(BigDecimal.ZERO)<0){
+            if (price.compareTo(BigDecimal.ZERO) < 0) {
                 return getErrReturnObject().setErrMsg("价格不可小于0").toString();
             }
             if (isInsert) {
@@ -158,7 +158,7 @@ public class OrderItems extends Controller {
                 if (promotionRows.get(0).getString("type").equals("打包促销")) {
                     BigDecimal orderaddqty = promotionRows.get(0).getBigDecimal("orderaddqty");
                     BigDecimal orderminqty = promotionRows.get(0).getBigDecimal("orderminqty");
-                    if (((sumqty.subtract(orderminqty)).remainder(orderaddqty)).compareTo(BigDecimal.ZERO) != 0 || sumqty.compareTo(orderminqty)<0) {
+                    if (((sumqty.subtract(orderminqty)).remainder(orderaddqty)).compareTo(BigDecimal.ZERO) != 0 || sumqty.compareTo(orderminqty) < 0) {
                         return getErrReturnObject().setErrMsg("不符合促销活动订购数量规则，修改不成功").toString();
                     }
                 }
@@ -179,6 +179,10 @@ public class OrderItems extends Controller {
         //更新订单扣款信息
         updateAccountclassinfos(sa_orderid);
 
+        if (systemclient.equalsIgnoreCase("wechatsaletool")) {
+            Rows rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,sa_orderitems_v,itemid from sa_orderitems WHERE sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
+            return getSucReturnObject().setData(rows).toString();
+        }
 
         return getSucReturnObject().toString();
     }
@@ -422,7 +426,7 @@ public class OrderItems extends Controller {
                 sqlList.add("update sa_orderitems set price=" + price + ",amount=" + amount + " where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
             }
         }
-        sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "订单整单折扣变更【"+discountrate+"】","整单折扣").getSQL());
+        sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "订单整单折扣变更【" + discountrate + "】", "整单折扣").getSQL());
         dbConnect.runSqlUpdate(sqlList);
 
         updateAccountclassinfos(sa_orderid);
@@ -466,7 +470,7 @@ public class OrderItems extends Controller {
                 sqlList.add("update sa_orderitems set price=" + price + ",amount=" + amount + " where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
             }
         }
-        sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "订单商品行价格刷新(恢复原价)","订单商品行价格刷新").getSQL());
+        sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "订单商品行价格刷新(恢复原价)", "订单商品行价格刷新").getSQL());
         dbConnect.runSqlUpdate(sqlList);
         updateAccountclassinfos(sa_orderid);
         return getSucReturnObject().toString();
@@ -571,7 +575,7 @@ public class OrderItems extends Controller {
         WebRequest request = new WebRequest();
         String result = request.doPost(object.toString(),
                 "http://60.190.151.198:8092/BYESB/jaxrs/webclientrest");
-        if(isJSONArray(result)){
+        if (isJSONArray(result)) {
             jsonArray = JSONArray.parseArray(result);
         }
         for (Object obj : jsonArray) {
@@ -729,13 +733,13 @@ public class OrderItems extends Controller {
                 String convenient = whereObject.getStringValue("convenient");
                 if (convenient.equals("待确认")) {
                     where.append(" and t5.status ='预提交' ");
-                }else if(convenient.equals("待审核")){
+                } else if (convenient.equals("待审核")) {
                     where.append(" and t5.status ='提交' ");
-                }else if(convenient.equals("待发货")){
+                } else if (convenient.equals("待发货")) {
                     where.append(" and t5.status not in ('预提交','新建') and not exists(select 1 from st_stockbill_items s1 inner join st_stockbill s2 on s1.st_stockbillid=s2.st_stockbillid and s1.siteid=s2.siteid where s2.status='审核' and s2.rb=1 and s1.sa_orderitemsid=t1.sa_orderitemsid)");
-                }else if(convenient.equals("已发货")){
+                } else if (convenient.equals("已发货")) {
                     where.append(" and exists(select 1 from st_stockbill_items s1 inner join st_stockbill s2 on s1.st_stockbillid=s2.st_stockbillid and s1.siteid=s2.siteid where s2.status='审核' and s2.rb=1 and s1.sa_orderitemsid=t1.sa_orderitemsid)");
-                }else if(convenient.equals("已取消")){
+                } else if (convenient.equals("已取消")) {
                     where.append(" and t5.status ='手工关闭' and  exists(select 1 from (\n" +
                             "select  s1.sa_orderitemsid,s1.siteid,sum(s1.qty) qty from st_stockbill_items s1 inner join st_stockbill s2 on s1.st_stockbillid=s2.st_stockbillid and s1.siteid=s2.siteid where s2.status='审核' and s2.rb=1 group by s1.sa_orderitemsid,s1.siteid) s right join sa_orderitems s1  on s.sa_orderitemsid=s1.sa_orderitemsid and s.siteid=s1.siteid where s1.qty>ifnull(s.qty,0) and s1.sa_orderitemsid=t1.sa_orderitemsid)");
                 }