diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java index 1f47ce52..750374d7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java @@ -42,7 +42,7 @@ public class AcTourismServiceProvider implements IAcTourismServiceApi { iAcDeclarationGiftConfigService.handleDeclarationData(); return R.ok(); } catch (Exception e) { - log.error("旅游活动更新积分异常", e); + log.error("报单赠送更新提货列表异常", e); } return R.fail(); } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml index 1de3fced..98cba8c9 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml @@ -32,32 +32,36 @@ PK_ID, PK_BASE_ID, REGISTER_AUTHORITY, PK_PRODUCT, SPECS_NAME, SPECS_NAME_ID, QUANTITY, LEVEL - DECLARE - v_error_count NUMBER := 0; + DECLARE v_error_count NUMBER := 0; BEGIN BEGIN - MERGE INTO AC_PICK tgt USING (SELECT adgr.PK_ID AS SRC_ID, - adgr.PK_MEMBER, - 32 AS PICK_TYPE, - adgc.PK_ID AS PK_BASE_CONFIG, - adgr.PK_PRODUCT AS PK_DATA_ID, - adgc.SPECS_NAME AS SPECS_NAME, - adgc.SPECS_NAME_ID AS SPECS_NAME_ID, - adgr.QUANTITY AS USABLE_QUANTITY, - bp.COVER AS PICK_COVER, - 0 AS IS_FREE_MAIL, - 0 AS DEL_FLAG, - adgr.QUANTITY AS BASE_QUANTITY, - adgr.PK_BASE_ID AS PK_BASE_ID, - SYSDATE AS CREATION_TIME, - adgr.PK_MEMBER AS PK_CREATOR, - #{pkCountry} AS PK_COUNTRY - FROM AC_DECLARATION_GIFT_RECORD adgr - LEFT JOIN AC_DECLARATION_GIFT_CONFIG adgc ON adgr.PK_RULE_ID = adgc.PK_ID - 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 ( + MERGE INTO AC_PICK tgt USING ( + SELECT + adgr.PK_ID AS SRC_ID, + adgr.PK_MEMBER, + 32 AS PICK_TYPE, + adgc.PK_ID AS PK_BASE_CONFIG, + adgr.PK_PRODUCT AS PK_DATA_ID, + adgc.SPECS_NAME AS SPECS_NAME, + adgc.SPECS_NAME_ID AS SPECS_NAME_ID, + adgr.QUANTITY AS USABLE_QUANTITY, + bp.COVER AS PICK_COVER, + 0 AS IS_FREE_MAIL, + 0 AS DEL_FLAG, + adgr.QUANTITY AS BASE_QUANTITY, + adgr.PK_BASE_ID AS PK_BASE_ID, + SYSDATE AS CREATION_TIME, + 100000000 AS PK_CREATOR, + 1 AS PK_COUNTRY + FROM + AC_DECLARATION_GIFT_RECORD adgr + LEFT JOIN AC_DECLARATION_GIFT_CONFIG adgc ON adgr.PK_RULE_ID = adgc.PK_ID + 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 AND tgt.PK_BASE_CONFIG = src.PK_BASE_CONFIG AND tgt.PK_DATA_ID = src.PK_DATA_ID @@ -89,7 +93,9 @@ PK_CREATOR, PK_COUNTRY ) - VALUES (AC_PICK_SEQ.NEXTVAL, + VALUES + ( + AC_PICK_SEQ.NEXTVAL, src.PK_MEMBER, src.PICK_TYPE, src.PK_BASE_CONFIG, @@ -103,26 +109,31 @@ src.BASE_QUANTITY, src.PK_BASE_ID, src.CREATION_TIME, - src.PK_CREATOR, - src.PK_COUNTRY); + 100000000, + src.PK_COUNTRY + ); UPDATE AC_DECLARATION_GIFT_RECORD 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 WHEN OTHERS THEN v_error_count := SQL % ROWCOUNT; UPDATE AC_DECLARATION_GIFT_RECORD 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; - INSERT INTO AC_PICK_LOG (PK_ID, PK_PICK, PK_USER, QUANTITY, PK_COUNTRY) - SELECT AC_PICK_LOG_SEQ.NEXTVAL, - p.PK_ID, - p.PK_CREATOR, - p.USABLE_QUANTITY, - p.PK_COUNTRY - FROM AC_PICK p - WHERE TRUNC(p.CREATION_TIME) = TRUNC(SYSDATE) + INSERT INTO AC_PICK_LOG (PK_ID, PK_PICK, PK_USER, QUANTITY, PK_COUNTRY) SELECT + AC_PICK_LOG_SEQ.NEXTVAL, + p.PK_ID, + p.PK_CREATOR, + p.USABLE_QUANTITY, + p.PK_COUNTRY + FROM + AC_PICK p + WHERE + TRUNC(p.CREATION_TIME) = TRUNC(SYSDATE) OR TRUNC(p.MODIFIED_TIME) = TRUNC(SYSDATE); COMMIT; END;