Merge branch 'develop' into develop-green

src/custom/beans/accountbalance/Accountbalance.java

@@ -242,7 +242,7 @@ public class Accountbalance extends BaseClass {
                 throw new YosException(false, "该营销账户不存在，支出凭证无法审核");
             } else {
                 BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
-                if (cashbillEntity.getAmount().compareTo(canuseamount) == 1) {
+                if (cashbillEntity.getAmount().compareTo(canuseamount) == 1 && cashbillEntity.getAmount().compareTo(BigDecimal.ZERO)>=0) {
                     throw new YosException(false, "该营销账户可用余额不足，支出凭证无法审核");
                 }
                 BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(cashbillEntity.getAmount());
@@ -387,7 +387,7 @@ public class Accountbalance extends BaseClass {
                 throw new YosException(false, "该营销账户不存在，支出凭证无法审核");
             } else {
                 BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
-                if (cashbillEntity.getAmount().compareTo(canuseamount) == 1 ) {
+                if (cashbillEntity.getAmount().compareTo(canuseamount) == 1  && cashbillEntity.getAmount().compareTo(BigDecimal.ZERO)>=0) {
                     throw new YosException(false, "该营销账户可用余额不足，支出凭证无法审核");
                 }
                 BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(cashbillEntity.getAmount());

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -789,7 +789,7 @@ public class cashbill extends Controller {
                     }
                 } else {
                     BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
-                    if (rows.get(0).getBigDecimal("amount").compareTo(canuseamount) == 1 ) {
+                    if (rows.get(0).getBigDecimal("amount").compareTo(canuseamount) == 1  && rows.get(0).getBigDecimal("amount").compareTo(BigDecimal.ZERO)>=0) {
                         return getErrReturnObject().setErrMsg("该营销账户可用余额不足，支出凭证无法审核")
                                 .toString();
                     }

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

@@ -29,6 +29,7 @@ import restcontroller.R;
 import restcontroller.sale.cashbill.cashbill;
 import restcontroller.sale.promotion.promotion;
 import restcontroller.webmanage.executorService.Executor;
+import restcontroller.webmanage.sale.promotion.promotionAuth;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -1415,7 +1416,7 @@ public class Order extends Controller {
 
 
     @API(title = "提交", apiversion = R.ID20221108153402.v1.class, intervaltime = 5000)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class, promotion.class, restcontroller.webmanage.sale.promotion.promotion.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class, promotion.class, restcontroller.webmanage.sale.promotion.promotion.class, promotionAuth.class})
     public String submit() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
 
@@ -3502,6 +3503,7 @@ public class Order extends Controller {
     }
 
     @API(title = "订单手动关闭", apiversion = R.ID20230406155202.v1.class)
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class, promotion.class, restcontroller.webmanage.sale.promotion.promotion.class, promotionAuth.class})
     public String closeOrder() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");