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-21 15:22:09 +08:00
parent d3a5667f45
commit bcb0f0e249
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java
View File

@ -116,6 +116,7 @@ public class ApiPickController extends BaseController {
switch (EPickType.getEnumByValue(acPick.getPickType())) { switch (EPickType.getEnumByValue(acPick.getPickType())) {
case PICK_PRODUCT: case PICK_PRODUCT:
case PRIZE: case PRIZE:
case DECLARATION_GIFT:
// 提货产品处理、迁移抽奖处理 // 提货产品处理、迁移抽奖处理
// 查询产品 // 查询产品
ProductDTO productDTO = iProductServiceApi.getProduct(acPick.getPkDataId().intValue()).getData(); ProductDTO productDTO = iProductServiceApi.getProduct(acPick.getPkDataId().intValue()).getData();
@ -143,19 +144,6 @@ public class ApiPickController extends BaseController {
.build()); .build());
} }
break; break;
case DECLARATION_GIFT:
// 处理报单赠送活动
List<AcGiftConfigExt> 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()); apiPickVO.setIsFreeMail(acPick.getIsFreeMail());

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java
View File

@ -197,7 +197,7 @@ public class AcPickController extends BaseController {
AcPickExt acPickExt = iAcPickService.queryDetail(pkId, pkCountry); AcPickExt acPickExt = iAcPickService.queryDetail(pkId, pkCountry);
if (null != acPickExt) { if (null != acPickExt) {
acPickQueryVO = BeanUtil.copyProperties(acPickExt, AcPickQueryVO.class); 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() acPickQueryVO.setDetailList(Collections.singletonList(AcPickQueryDetailVO.builder()
.pkProduct(acPickExt.getPkDataId().intValue()) .pkProduct(acPickExt.getPkDataId().intValue())

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

@ -31,7 +31,8 @@
PK_COUNTRY, PK_COUNTRY,
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">DECLARE <update id="updateOrInsertPick">
DECLARE
v_error_count NUMBER := 0; v_error_count NUMBER := 0;
BEGIN BEGIN
BEGIN BEGIN
@ -46,7 +47,7 @@
bp.COVER AS PICK_COVER, bp.COVER AS PICK_COVER,
0 AS IS_FREE_MAIL, 0 AS IS_FREE_MAIL,
0 AS DEL_FLAG, 0 AS DEL_FLAG,
SUM(adgd.QUANTITY) AS BASE_QUANTITY, bpe.DELIVERY_QUANTITY AS BASE_QUANTITY,
SYSDATE AS CREATION_TIME, SYSDATE AS CREATION_TIME,
100000000 AS PK_CREATOR, 100000000 AS PK_CREATOR,
#{pkCountry} AS PK_COUNTRY #{pkCountry} AS PK_COUNTRY
@ -62,6 +63,7 @@
adgd.PK_PRODUCT, adgd.PK_PRODUCT,
adgd.SPECS_NAME, adgd.SPECS_NAME,
adgd.SPECS_NAME_ID, adgd.SPECS_NAME_ID,
bpe.DELIVERY_QUANTITY,
bp.COVER) src bp.COVER) src
ON ( ON (
tgt.PICK_TYPE = src.PICK_TYPE tgt.PICK_TYPE = src.PICK_TYPE

2
bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml
View File

@ -214,7 +214,7 @@
cm.member_code, cm.member_code,
cm.member_name, cm.member_name,
case case
when ap.pick_type in (0, 8) then when ap.pick_type in (0, 8, 32) then
(select bp.product_name (select bp.product_name
from bd_product bp from bd_product bp
where bp.pk_id = PK_DATA_ID) where bp.pk_id = PK_DATA_ID)