|
|
@@ -1681,7 +1681,7 @@ public class contractApproveController {
|
|
|
|
|
|
// 1. 查询需要更新的数据：新增查询a表ID（a.ID AS a_id）
|
|
|
String querySql = "SELECT " +
|
|
|
- "a.ID AS a_id, " + // 【修改1：新增查询a表ID，用于存到c表COMMISSION_IMPORT_ID】
|
|
|
+ "a.ID AS a_id, " +
|
|
|
"a.COMMISSION_DOLLARS AS 佣金, " +
|
|
|
"a.TOTAL_DOLLARS AS 基数, " +
|
|
|
"a.RATIO AS 比例, " +
|
|
|
@@ -1689,7 +1689,7 @@ public class contractApproveController {
|
|
|
"c.ID AS c_id " +
|
|
|
"FROM BO_EU_DNCTT_COMMISSION_IMPORT a " +
|
|
|
"JOIN BO_EU_DNCTT_COMMISSION b " +
|
|
|
- "ON a.ACCOUNT_NO = b.NEW_ACCOUNT AND a.DEVICE_ID = b.DEVICE_ID " +
|
|
|
+ "ON a.ACCOUNT_USER_NO = b.NEW_ACCOUNT AND a.DEVICE_ID = b.DEVICE_ID AND a.RULE_NO = b.RULE_NO " +
|
|
|
"JOIN BO_EU_DNCTT_COMMISSION_PERIOD c " +
|
|
|
"ON a.ZB_FEE_DATE = c.ZB_FEE_DATE AND b.bindid = c.bindid " +
|
|
|
"WHERE a.ZB_FEE_DATE = ?";
|
|
|
@@ -1752,7 +1752,7 @@ public class contractApproveController {
|
|
|
// 4. 执行更新：新增COMMISSION_IMPORT_ID字段的更新
|
|
|
DBSql.update(connUpdate,
|
|
|
"UPDATE BO_EU_DNCTT_COMMISSION_PERIOD " +
|
|
|
- "SET COMMISSION_DOLLARS = ?, " +
|
|
|
+ "SET COMMISSION_DOLLARS_IMPORT = ?, " +
|
|
|
"TOTAL_DOLLARS_IMPORT = ?, " +
|
|
|
"RATIO_IMPORT = ?, " +
|
|
|
"ZB_BILLING_DATE = ?, " +
|
