angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 提货记录定时任务记录字段修改

This commit is contained in:
zhangheng 2025-10-15 16:23:37 +08:00 committed by cabbage
parent d87967d30c
commit bf140267ee
2 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java
View File

@ -42,7 +42,7 @@ public class AcTourismServiceProvider implements IAcTourismServiceApi {
iAcDeclarationGiftConfigService.handleDeclarationData(); iAcDeclarationGiftConfigService.handleDeclarationData();
return R.ok(); return R.ok();
} catch (Exception e) { } catch (Exception e) {
log.error("旅游活动更新积分异常", e); log.error("报单赠送更新提货列表异常", e);
} }
return R.fail(); return R.fail();
} }

85
bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml
View File

@ -32,32 +32,36 @@
PK_ID, PK_BASE_ID, REGISTER_AUTHORITY, PK_PRODUCT, SPECS_NAME, SPECS_NAME_ID, QUANTITY, LEVEL PK_ID, PK_BASE_ID, REGISTER_AUTHORITY, PK_PRODUCT, SPECS_NAME, SPECS_NAME_ID, QUANTITY, LEVEL
</sql> </sql>
<update id="updateOrInsertPick"> <update id="updateOrInsertPick">
DECLARE DECLARE v_error_count NUMBER := 0;
v_error_count NUMBER := 0;
BEGIN BEGIN
BEGIN BEGIN
MERGE INTO AC_PICK tgt USING (SELECT adgr.PK_ID AS SRC_ID, MERGE INTO AC_PICK tgt USING (
adgr.PK_MEMBER, SELECT
32 AS PICK_TYPE, adgr.PK_ID AS SRC_ID,
adgc.PK_ID AS PK_BASE_CONFIG, adgr.PK_MEMBER,
adgr.PK_PRODUCT AS PK_DATA_ID, 32 AS PICK_TYPE,
adgc.SPECS_NAME AS SPECS_NAME, adgc.PK_ID AS PK_BASE_CONFIG,
adgc.SPECS_NAME_ID AS SPECS_NAME_ID, adgr.PK_PRODUCT AS PK_DATA_ID,
adgr.QUANTITY AS USABLE_QUANTITY, adgc.SPECS_NAME AS SPECS_NAME,
bp.COVER AS PICK_COVER, adgc.SPECS_NAME_ID AS SPECS_NAME_ID,
0 AS IS_FREE_MAIL, adgr.QUANTITY AS USABLE_QUANTITY,
0 AS DEL_FLAG, bp.COVER AS PICK_COVER,
adgr.QUANTITY AS BASE_QUANTITY, 0 AS IS_FREE_MAIL,
adgr.PK_BASE_ID AS PK_BASE_ID, 0 AS DEL_FLAG,
SYSDATE AS CREATION_TIME, adgr.QUANTITY AS BASE_QUANTITY,
adgr.PK_MEMBER AS PK_CREATOR, adgr.PK_BASE_ID AS PK_BASE_ID,
#{pkCountry} AS PK_COUNTRY SYSDATE AS CREATION_TIME,
FROM AC_DECLARATION_GIFT_RECORD adgr 100000000 AS PK_CREATOR,
LEFT JOIN AC_DECLARATION_GIFT_CONFIG adgc ON adgr.PK_RULE_ID = adgc.PK_ID 1 AS PK_COUNTRY
LEFT JOIN BD_PRODUCT bp ON adgr.PK_PRODUCT = bp.PK_ID FROM
LEFT JOIN BD_PRODUCT_EXTEND bpe ON bp.PK_ID = bpe.PK_PRODUCT AC_DECLARATION_GIFT_RECORD adgr
WHERE TRUNC(adgr.CREATION_TIME) = TRUNC(SYSDATE) - 7 LEFT JOIN AC_DECLARATION_GIFT_CONFIG adgc ON adgr.PK_RULE_ID = adgc.PK_ID
OR adgr.SYNC_STATUS = 2) src ON ( LEFT JOIN BD_PRODUCT bp ON adgr.PK_PRODUCT = bp.PK_ID
LEFT JOIN BD_PRODUCT_EXTEND bpe ON bp.PK_ID = bpe.PK_PRODUCT
WHERE
TRUNC(adgr.CREATION_TIME) = TRUNC(SYSDATE) - 7
OR adgr.SYNC_STATUS = 2
) src ON (
tgt.PICK_TYPE = src.PICK_TYPE tgt.PICK_TYPE = src.PICK_TYPE
AND tgt.PK_BASE_CONFIG = src.PK_BASE_CONFIG AND tgt.PK_BASE_CONFIG = src.PK_BASE_CONFIG
AND tgt.PK_DATA_ID = src.PK_DATA_ID AND tgt.PK_DATA_ID = src.PK_DATA_ID
@ -89,7 +93,9 @@
PK_CREATOR, PK_CREATOR,
PK_COUNTRY PK_COUNTRY
) )
VALUES (AC_PICK_SEQ.NEXTVAL, VALUES
(
AC_PICK_SEQ.NEXTVAL,
src.PK_MEMBER, src.PK_MEMBER,
src.PICK_TYPE, src.PICK_TYPE,
src.PK_BASE_CONFIG, src.PK_BASE_CONFIG,
@ -103,26 +109,31 @@
src.BASE_QUANTITY, src.BASE_QUANTITY,
src.PK_BASE_ID, src.PK_BASE_ID,
src.CREATION_TIME, src.CREATION_TIME,
src.PK_CREATOR, 100000000,
src.PK_COUNTRY); src.PK_COUNTRY
);
UPDATE AC_DECLARATION_GIFT_RECORD UPDATE AC_DECLARATION_GIFT_RECORD
SET SYNC_STATUS = 1 SET SYNC_STATUS = 1
WHERE (TRUNC(CREATION_TIME) = TRUNC(SYSDATE) - 7 OR SYNC_STATUS = 2); WHERE
(TRUNC(CREATION_TIME) = TRUNC(SYSDATE) - 7 OR SYNC_STATUS = 2);
EXCEPTION EXCEPTION
WHEN OTHERS THEN WHEN OTHERS THEN
v_error_count := SQL % ROWCOUNT; v_error_count := SQL % ROWCOUNT;
UPDATE AC_DECLARATION_GIFT_RECORD UPDATE AC_DECLARATION_GIFT_RECORD
SET SYNC_STATUS = 2 SET SYNC_STATUS = 2
WHERE (TRUNC(CREATION_TIME) = TRUNC(SYSDATE) - 7 OR SYNC_STATUS = 2); WHERE
(TRUNC(CREATION_TIME) = TRUNC(SYSDATE) - 7 OR SYNC_STATUS = 2);
END; END;
INSERT INTO AC_PICK_LOG (PK_ID, PK_PICK, PK_USER, QUANTITY, PK_COUNTRY) INSERT INTO AC_PICK_LOG (PK_ID, PK_PICK, PK_USER, QUANTITY, PK_COUNTRY) SELECT
SELECT AC_PICK_LOG_SEQ.NEXTVAL, AC_PICK_LOG_SEQ.NEXTVAL,
p.PK_ID, p.PK_ID,
p.PK_CREATOR, p.PK_CREATOR,
p.USABLE_QUANTITY, p.USABLE_QUANTITY,
p.PK_COUNTRY p.PK_COUNTRY
FROM AC_PICK p FROM
WHERE TRUNC(p.CREATION_TIME) = TRUNC(SYSDATE) AC_PICK p
WHERE
TRUNC(p.CREATION_TIME) = TRUNC(SYSDATE)
OR TRUNC(p.MODIFIED_TIME) = TRUNC(SYSDATE); OR TRUNC(p.MODIFIED_TIME) = TRUNC(SYSDATE);
COMMIT; COMMIT;
END; END;