Merge branch 'master' of http://210.51.45.41:3000/itcat_admin/aws_donenow

com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/controller/commissionController.java

@@ -36,8 +36,8 @@ public class commissionController {
         commissionBO.remove("CREATEDATE");
         commissionBO.remove("CREATEUSER");
         editBO.setAll(commissionBO.asMap());
-        editBO.set("OLD_COMMISSION_DOLLARS", commissionBO.get("COMMISSION_DOLLARS"));
         editBO.set("OLD_RATIO", commissionBO.get("DOLLARS"));
+        editBO.set("OLD_COMMISSION_DOLLARS", commissionBO.get("COMMISSION_DOLLARS"));
         editBO.set("COMMISSION_BINDID", commissionBindid);
         editBO.set("IS_EFFECTIVE", "未执行");
         SDK.getBOAPI().create("BO_EU_DNCTT_COMMISSION_ADJUST", editBO, contractInstance, uc);

com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/event/commissionFormAfterSave.java

@@ -275,14 +275,14 @@ public class commissionFormAfterSave extends ExecuteListener {
                                 String periodSalesBOID = DBSql.getString(conn, "SELECT ID FROM BO_EU_DNCTT_COMMISSION_PERIOD_SALES WHERE PERIOD_BEGIN_DATE=? AND BINDID=? AND SALESPERSON=?", new Object[]{period.getPeriodBeginDateStr(), COMMISSION_BINDID, commissionSalesBO.get("SALESPERSON")});
 
                                 if (StringUtils.isNotBlank(periodSalesBOID)) {
-                                    BO periodSalesBO = SDK.getBOAPI().get("BO_EU_DNCTT_COMMISSION_PERIOD_AGENT", periodSalesBOID);
+                                    BO periodSalesBO = SDK.getBOAPI().get("BO_EU_DNCTT_COMMISSION_PERIOD_SALES", periodSalesBOID);
                                     if (StringUtils.isNotBlank(periodSalesBO.getString("APPROVE_AND_POST_USER_ID")) && StringUtils.isNotBlank(periodSalesBO.getString("APPROVE_AND_POST_DATE"))) {
                                         //已审批，不能修改
                                     } else {
                                         periodSalesBO.set("PERIOD_END_DATE", period.getPeriodEndDateStr());
                                         periodSalesBO.set("COMMISSION_DOLLARS", multiply(period.getRate(), commissionSalesBO.get("COMMISSION_DOLLARS")));
                                         periodSalesBO.set("PERIOD_ADJUSTED_PRICE", periodSalesBO.get("COMMISSION_DOLLARS"));
-                                        SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD_AGENT", periodSalesBO, conn);
+                                        SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD_SALES", periodSalesBO, conn);
                                     }
                                 } else {
                                     BO periodSalesBO = new BO();