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 98cba8c9..e612a930 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 @@ -42,8 +42,8 @@ 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, + adgd.SPECS_NAME AS SPECS_NAME, + adgd.SPECS_NAME_ID AS SPECS_NAME_ID, adgr.QUANTITY AS USABLE_QUANTITY, bp.COVER AS PICK_COVER, 0 AS IS_FREE_MAIL, @@ -52,10 +52,11 @@ adgr.PK_BASE_ID AS PK_BASE_ID, SYSDATE AS CREATION_TIME, 100000000 AS PK_CREATOR, - 1 AS PK_COUNTRY + #{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 AC_DECLARATION_GIFT_DETAIL adgd ON adgc.PK_ID = adgd.PK_RULE_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