Merge remote-tracking branch 'origin/develop' into develop-test

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

@@ -2213,6 +2213,7 @@ public class Order extends Controller {
                         sqlList.add(insertSQL.getSQL());
                     }
                     String depname = departmenthrrows.isNotEmpty() ? departmenthrrows.get(0).getString("depname") : "";
+                    Long sys_enterpriseid =  orderdetailRows.get(0).getLong("sys_enterpriseid");
                     if (depname.equals("售后部")) {
                         if (accountbalancerowsMap.containsKey(sys_enterpriseid)) {
                             if (accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount").compareTo(BigDecimal.ZERO) > 0) {
@@ -2497,6 +2498,7 @@ public class Order extends Controller {
                         sqlList.add(insertSQL.getSQL());
                     }
                     String depname = departmenthrrows.isNotEmpty() ? departmenthrrows.get(0).getString("depname") : "";
+                    Long sys_enterpriseid =  orderdetailRows.get(0).getLong("sys_enterpriseid");
                     if (depname.equals("售后部")) {
                         if (accountbalancerowsMap.containsKey(sys_enterpriseid)) {
                             if (accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount").compareTo(BigDecimal.ZERO) > 0) {

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

@@ -1894,9 +1894,13 @@ public class OrderItems extends Controller {
             updateSQL.setSiteid(siteid);
             updateSQL.setUniqueid(row.getLong("sa_orderitemsid"));
             updateSQL.setValue("billingstatus", row.getString("billingstatus"));
-            updateSQL.setValue("canoffqty", row.getString("qty"));
             updateSQL.setValue("tobeoffqty", 0);
-            updateSQL.setValue("oddstatus", 1);
+            if (row.getString("billingstatus").equals("保内收费")) {
+                updateSQL.setValue("canoffqty", row.getString("qty"));
+                updateSQL.setValue("offstatus", 1);
+            } else {
+                updateSQL.setValue("canoffqty", 0);
+            }
 
             // 将生成的 SQL 加入列表
             sqlList.add(updateSQL.getSQL());