From 062fb1ed6efcaac5d75bbe184524c4929dff7fcd Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 18 十月 2023 15:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index c959663..455f330 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -448,12 +448,28 @@
detailsResponse.setUseStatus(pointsMerchandise.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(merchandise.getType());
if(merchandise.getType()==3){
+ detailsResponse.setCardType(merchandise.getCardType());
+ List<Integer> sids = new ArrayList<>();
detailsResponse.setUserId(appUserId);
if(merchandise.getUseScope()==1){
- detailsResponse.setSid(0);
+ sids.add(0);
+ detailsResponse.setSid(sids);
}else if(merchandise.getUseScope()==2){
+ // 指定城市
+ List<PointsMerchandiseCity> list = pmdsCityService.list(new LambdaQueryWrapper<PointsMerchandiseCity>().eq(PointsMerchandiseCity::getPointsMerchandiseId, merchandise.getId()));
+ List<String> collect = list.stream().map(PointsMerchandiseCity::getCityCode).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add("-1");
+ }
+ List<Integer> storeIds = stoClient.queryStoreIdByCityCode(collect);
+ detailsResponse.setSid(storeIds);
}else if(merchandise.getUseScope()==3){
+ // 指定门店
+ List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
+ List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+ detailsResponse.setSid(collect);
+
}
}
--
Gitblit v1.7.1