促销方案商品查询改为查询促销方案所属领域

src/custom/restcontroller/R.java

@@ -4640,6 +4640,11 @@ public class R {
         public static class v1 {
         }
     }
+    public static class ID20230331102503 {
+        public static class v1 {
+        }
+    }
+
 }
 
 

src/custom/restcontroller/sale/creditbill/SQL/信用额度调整单表体新增.sql

@@ -1,2 +1,2 @@
-insert into sa_creditbilldetail (siteid, sa_creditbilldetailid, sa_creditbillid,sys_enterpriseid,sa_accountclassid, creditquota,remarks)
-values ($siteid$, $sa_creditbilldetailid$, $sa_creditbillid$,$sys_enterpriseid$, $sa_accountclassid$, $creditquota$,$remarks$);
+insert into sa_creditbilldetail (siteid, sa_creditbilldetailid, sa_creditbillid,sys_enterpriseid,sa_accountclassid, creditquota)
+values ($siteid$, $sa_creditbilldetailid$, $sa_creditbillid$,$sys_enterpriseid$, $sa_accountclassid$, $creditquota$);

src/custom/restcontroller/sale/creditbill/SQL/信用额度调整单表体更新.sql

@@ -2,6 +2,5 @@ UPDATE sa_creditbilldetail
 SET 
     sys_enterpriseid = $sys_enterpriseid$,
     sa_accountclassid = $sa_accountclassid$,
-    creditquota = $creditquota$,
-    remarks=$remarks$
+    creditquota = $creditquota$
 WHERE sa_creditbilldetailid = $sa_creditbilldetailid$ and siteid=$siteid$

src/custom/restcontroller/sale/creditbill/SQL/信用额度调整单表体查询.sql

@@ -4,7 +4,6 @@ SELECT
 	t1.sys_enterpriseid,
 	t1.sa_accountclassid,
 	t1.creditquota,
-	t1.remarks,
 	t3.accountno,
 	t3.accountname,
 	t2.enterprisename,

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

@@ -1247,6 +1247,55 @@ public class Order extends Controller {
         return getSucReturnObject().toString();
     }
 
+    @API(title = "复核反复核", apiversion = R.ID20230331102503.v1.class)
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    public String recheck() throws YosException {
+        boolean isrecheck = content.getBooleanValue("isrecheck");
+        Long sa_orderid = content.getLong("sa_orderid");
+        Rows rows = getOrderRows(this, sa_orderid);
+        if (rows.isEmpty()) {
+            return getErrReturnObject().setErrMsg("订单不存在").toString();
+        }
+        Row row = rows.get(0);
+
+        String sonum = row.getString("sonum");
+        //验证结算企业
+        Long sys_enterpriseid = row.getLong("sys_enterpriseid");
+
+        BigDecimal amount = beans.order.Order.getAmount(this, sa_orderid);
+        ArrayList<String> sqlList = new ArrayList<>();
+        if (isrecheck) {
+            if (!row.getString("status").equals("审核")) {
+                return getErrReturnObject().setErrMsg("单号为：【" + row.getString("sonum") + "】的订单为非审核状态，无法复核")
+                        .toString();
+            }
+        } else {
+            if (!row.getString("status").equals("复核")) {
+                return getErrReturnObject().setErrMsg("单号为：【" + row.getString("sonum") + "】的订单为非复核状态，无法反复核")
+                        .toString();
+            }
+        }
+        SQLFactory sqlFactoryupdate;
+        String message ="";
+        if (isrecheck) {
+             message = "您的订单【" + sonum + "】已复核，请注意查看！";
+            sqlFactoryupdate = new SQLFactory(this, "订单复核");
+            sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "复核", "订单复核成功，金额：" + amount).getSQL());
+        } else {
+             message = "您的订单【" + sonum + "】已反复核，请注意查看！";
+            sqlFactoryupdate = new SQLFactory(this, "订单反复核");
+            sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "反复核", "订单反复核成功，金额：" + amount).getSQL());
+        }
+        sqlFactoryupdate.addParameter("siteid", siteid);
+        sqlFactoryupdate.addParameter("sa_orderid", sa_orderid);
+        sqlFactoryupdate.addParameter("recheckby", username);
+        sqlList.add(sqlFactoryupdate.getSQL());
+
+        dbConnect.runSqlUpdate(sqlList);
+        sendMsg(message, sa_orderid, sys_enterpriseid);
+        return getSucReturnObject().toString();
+    }
+
     @API(title = "退回", apiversion = R.ID20221108161902.v1.class, intervaltime = 5000)
     @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
     public String back() throws YosException {

src/custom/restcontroller/webmanage/sale/order/SQL/订单反复核.sql

@@ -0,0 +1 @@
+update sa_order set status='审核' where sa_orderid = $sa_orderid$ and siteid=$siteid$

src/custom/restcontroller/webmanage/sale/order/SQL/订单复核.sql

@@ -0,0 +1 @@
+update sa_order set status='复核' where sa_orderid = $sa_orderid$ and siteid=$siteid$

src/custom/restcontroller/webmanage/sale/promotion/promotionItems.java

@@ -53,7 +53,7 @@ public class promotionItems extends Controller {
         if(tradefield!=null && !tradefield.isEmpty()){
             for (Object object:tradefield) {
                 String str = String.valueOf(object);
-                where1=where1 +" or tradefield =+'"+str+"' ";
+                where1=where1 +" or tradefield ='"+str+"' ";
             }
         }