From bcb0f0e24974b435a6cf4d3618ae634b740ece47 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 21 Oct 2025 15:22:09 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8F=90=E8=B4=A7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98,=E5=85=85=E5=80=BC=E6=8F=90=E8=B4=A7?= =?UTF-8?q?=E5=8D=A1=E4=BA=A7=E5=93=81=E6=9C=AA=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98,=E6=8F=90=E8=B4=A7=E4=BA=A7=E5=93=81=E6=9C=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pick/controller/api/ApiPickController.java | 14 +------------- .../pick/controller/manage/AcPickController.java | 2 +- .../declaration/AcDeclarationGiftConfigMapper.xml | 6 ++++-- .../mapper/activity/pick/AcPickMapper.xml | 2 +- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java index f86193e2..31523e15 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java @@ -116,6 +116,7 @@ public class ApiPickController extends BaseController { switch (EPickType.getEnumByValue(acPick.getPickType())) { case PICK_PRODUCT: case PRIZE: + case DECLARATION_GIFT: // 提货产品处理、迁移抽奖处理 // 查询产品 ProductDTO productDTO = iProductServiceApi.getProduct(acPick.getPkDataId().intValue()).getData(); @@ -143,19 +144,6 @@ public class ApiPickController extends BaseController { .build()); } break; - case DECLARATION_GIFT: - // 处理报单赠送活动 - List acGiftConfigExtList = iAcDeclarationGiftRecordService.queryListByRuleIdList(Collections.singletonList(acPick.getPkDataId()),pkCountry); - for (AcGiftConfigExt acGiftConfigExt : acGiftConfigExtList) { - // 处理提货产品明细 - detailList.add(ApiPickDetailVO.builder() - .productName(acGiftConfigExt.getProductName()) - .specsName(acGiftConfigExt.getSpecsName()) - .cover(acGiftConfigExt.getCover()) - .quantity(acGiftConfigExt.getQuantity()) - .build()); - } - break; } apiPickVO.setIsFreeMail(acPick.getIsFreeMail()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java index 771b9380..79e58c9a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java @@ -197,7 +197,7 @@ public class AcPickController extends BaseController { AcPickExt acPickExt = iAcPickService.queryDetail(pkId, pkCountry); if (null != acPickExt) { acPickQueryVO = BeanUtil.copyProperties(acPickExt, AcPickQueryVO.class); - if (EPickType.PICK_PRODUCT.getValue() == acPickExt.getPickType()) { + if (EPickType.PICK_PRODUCT.getValue() == acPickExt.getPickType() || EPickType.DECLARATION_GIFT.getValue() == acPickExt.getPickType()) { // 产品处理 acPickQueryVO.setDetailList(Collections.singletonList(AcPickQueryDetailVO.builder() .pkProduct(acPickExt.getPkDataId().intValue()) 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 a8d03145..c6d0e842 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 @@ -31,7 +31,8 @@ PK_COUNTRY, PK_ID, PK_BASE_ID, REGISTER_AUTHORITY, PK_PRODUCT, SPECS_NAME, SPECS_NAME_ID, QUANTITY, LEVEL - DECLARE + + DECLARE v_error_count NUMBER := 0; BEGIN BEGIN @@ -46,7 +47,7 @@ bp.COVER AS PICK_COVER, 0 AS IS_FREE_MAIL, 0 AS DEL_FLAG, - SUM(adgd.QUANTITY) AS BASE_QUANTITY, + bpe.DELIVERY_QUANTITY AS BASE_QUANTITY, SYSDATE AS CREATION_TIME, 100000000 AS PK_CREATOR, #{pkCountry} AS PK_COUNTRY @@ -62,6 +63,7 @@ adgd.PK_PRODUCT, adgd.SPECS_NAME, adgd.SPECS_NAME_ID, + bpe.DELIVERY_QUANTITY, bp.COVER) src ON ( tgt.PICK_TYPE = src.PICK_TYPE diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml index e55ee453..cfb78461 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml @@ -214,7 +214,7 @@ cm.member_code, cm.member_name, case - when ap.pick_type in (0, 8) then + when ap.pick_type in (0, 8, 32) then (select bp.product_name from bd_product bp where bp.pk_id = PK_DATA_ID)