Преглед изворни кода

修复订单明细经销商查询接口

shenjingwei пре 4 месеци
родитељ
комит
9cb5a231eb

+ 1 - 1
src/custom/restcontroller/sale/order/Order.java

@@ -127,7 +127,7 @@ public class Order extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_brand", "t3", "t3.sa_brandid = t1.sa_brandid",
                 "brandname");
 
-        querySQL.setCondition("t1.sonum", "t4.name", "t1.remarks");
+        querySQL.setCondition("t1.sonum", "t1.remarks");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
         querySQL.setWhere("t1.sys_enterpriseid = $sys_enterpriseid$");

+ 1 - 0
src/custom/service/OrderAutoCheck.java

@@ -34,6 +34,7 @@ public class OrderAutoCheck extends ServiceController {
                 double amount = orderRow.getDouble("amount");
                 Rows accountbalanceRows = dbConnect.runSqlQuery("select ifnull(balance,0)+ifnull(creditquota,0)+ifnull(discountamount,0)-ifnull(freezamount,0) as canuseamount from sa_accountbalance where sys_enterpriseid=" + enterpriseid + " and sa_accountclassid=" + sa_accountclassid);
                 if (accountbalanceRows.isEmpty() || accountbalanceRows.get(0).getDouble("canuseamount") < amount) {
+                    logger.info("订单{}审核失败;{}", orderRow.getString("sonum"), "账户可用余额不足");
                     continue;
                 }
                 JSONObject content = new JSONObject();