From d713bb9314fe627be85ec824225ba80a2f53c265 Mon Sep 17 00:00:00 2001 From: woody Date: Tue, 29 Apr 2025 15:56:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(BdWaresSpecsSkuMapper.xml)=EF=BC=9A?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=8F=91=E5=B8=83-=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=9A=90=E8=97=8Fsku=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/activity/pick/controller/manage/AcPickController.java | 2 +- .../src/main/resources/mapper/activity/pick/AcPickMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c6659cd3..2ab82b0f 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 @@ -204,7 +204,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.COUPON.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/pick/AcPickMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml index 4d15ecf1..34826e6f 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 @@ -273,7 +273,7 @@ cm.member_code, cm.member_name, case - when ap.pick_type = 0 then + when ap.pick_type in (0, 8) then (select bp.product_name from bd_product bp where bp.pk_id = PK_DATA_ID)