Merge branch 'develop_green' into develop

# Conflicts:
#	src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java
#	src/custom/restcontroller/webmanage/sale/order/Order.java
#	src/custom/restcontroller/webmanage/sale/promotion/promotion.java
#	src/custom/restcontroller/webmanage/sale/rebateaccount/rebateaccounthead.java

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -595,7 +595,7 @@ public class aftersalesmag extends Controller {
                 cashbillEntity.setAmount(returnamount);
                 cashbillEntity.setOwnerid(sa_aftersalesmagid);
                 cashbillEntity.setOwnertable("sa_aftersalesmag");
-                cashbillEntity.setRemarks("退货单号：" + rows.get(0).getString("billno") + ";订单号：" + rows.get(0).getString("sonum"));
+                cashbillEntity.setRemarks("由返退单号" + rows.get(0).getString("billno") + "反复核时生成" );
                 cashbillEntity.setSource("退货单反复核");
                 if (!Accountbalance.judgeBalance(this, sys_enterpriseid, rows.get(0).getLong("sa_accountclassid"), returnamount)) {
                     return getErrReturnObject().setErrMsg("经销商账户余额不足无法反复核")

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

@@ -1523,7 +1523,7 @@ public class Order extends Controller {
                     for (Object object : accountclassinfos) {
                         JSONObject jsonObject = (JSONObject) object;
                         if (Accountbalance.judgeBalance(this, pay_enterpriseid, jsonObject.getLong("sa_accountclassid"), jsonObject.getBigDecimal("amount"))) {
-                            CashbillEntity entity = getCashbillEntity(jsonObject.getBigDecimal("amount"), sa_orderid, "订单提交", sonum, "由" + sonum + "订单提交时，" + jsonObject.getString("accountname") + "账户自动支出产生");
+                            CashbillEntity entity = getCashbillEntity(jsonObject.getBigDecimal("amount"), sa_orderid, "订单提交", sonum, "由订单号" + sonum + "提交时生成");
                             //
                             if (accountclassrowsMap.containsKey(jsonObject.getString("sa_accountclassid")) && accountclassrowsMap.get(jsonObject.getString("sa_accountclassid")).isNotEmpty()) {
                                 jsonObject.put("balance", accountclassrowsMap.get(jsonObject.getString("sa_accountclassid")).get(0).getBigDecimal("balance").subtract(jsonObject.getBigDecimal("amount")));
@@ -1732,7 +1732,7 @@ public class Order extends Controller {
                     for (Object object : accountclassinfos) {
                         JSONObject jsonObject = (JSONObject) object;
                         if (Accountbalance.judgeBalance(this, pay_enterpriseid, jsonObject.getLong("sa_accountclassid"), jsonObject.getBigDecimal("amount"))) {
-                            CashbillEntity entity = getCashbillEntity(jsonObject.getBigDecimal("amount"), sa_orderid, "订单审核", sonum, "由" + sonum + "订单审核时，" + jsonObject.getString("accountname") + "账户自动支出产生");
+                            CashbillEntity entity = getCashbillEntity(jsonObject.getBigDecimal("amount"), sa_orderid, "订单审核", sonum, "由订单号" + sonum + "审核时生成");
                             jsonObject.put("balance", jsonObject.getBigDecimalValue("balance").subtract(jsonObject.getBigDecimal("amount")));
                             JSONObject createCashbillPay = Accountbalance.createCashbillPay(this, pay_enterpriseid, jsonObject.getLong("sa_accountclassid"), entity, true);
                             sqlList.addAll(createCashbillPay.getJSONArray("sqlList").toJavaList(String.class));
@@ -3279,7 +3279,7 @@ public class Order extends Controller {
                 entity.setSourcenote(orderRow.get(0).getString("sonum"));
                 entity.setOwnerid(sa_orderid);
                 entity.setOwnertable("sa_order");
-                entity.setRemarks("由" + orderRow.get(0).getString("sonum") + "订单手工关闭时自动产生");
+                entity.setRemarks("由订单号" + orderRow.get(0).getString("sonum") + "手工关闭时生成");
                 entity.setType("普通费用");
                 entity.setTypemx("订单关闭退款");
                 JSONObject cashbillPay = Accountbalance.createCashbillPay(this, sys_enterpriseid, orderaccountclassinfo.getLongValue("sa_accountclassid"), entity, true);

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

@@ -579,7 +579,7 @@ public class promotion extends Controller {
         Long sa_promotion_authid = content.getLong("sa_promotion_authid");
         ArrayList<String> sqlList = new ArrayList<>();
         Rows promotionauthRows = dbConnect.runSqlQuery(
-                "select t1.*,t2.type,t2.rebateratio,t2.promname from sa_promotion_auth t1 inner join sa_promotion t2 on t1.siteid=t2.siteid and t1.sa_promotionid=t2.sa_promotionid where t1.sa_promotion_authid ='"
+                "select t1.*,t2.type,t2.rebateratio,t2.promname,t2.promnum from sa_promotion_auth t1 inner join sa_promotion t2 on t1.siteid=t2.siteid and t1.sa_promotionid=t2.sa_promotionid where t1.sa_promotion_authid ='"
                         + sa_promotion_authid + "' and  t1.siteid='" + siteid + "'");
         if (promotionauthRows.isNotEmpty()) {
             if (!promotionauthRows.get(0).getString("type").equals("返利促销")) {