From 1c9725d6267b73b1c5bc77135279b3dcfdd7e7b2 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 08 八月 2023 21:18:56 +0800
Subject: [PATCH] app端口：门店列表的处理
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 35 ++++++++++++++++++++---------------
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 6 ++++++
2 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 471d8df..ff27ba9 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -868,7 +868,7 @@
if (ToolUtil.isEmpty(tAppUser)){
return ResultUtil.error("用户不存在");
}
-// 查询是否超出限领数量
+// todo 积分商品明细 查询是否超出限领数量
switch (exchangeType.getGoodsType()){
case 1:
@@ -1334,24 +1334,29 @@
List<StoreResponse> responses = new ArrayList<>();
if (goodsType == 4){
List<Integer> couponStoreIds = ucponClient.getCouponStoreIds(pointsMerId);
- for (Integer couponStoreId : couponStoreIds) {
- StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreId);
- if(ToolUtil.isNotEmpty(courseOfStore)){
- StoreResponse response = new StoreResponse();
- response.setStoreId(couponStoreId);
- response.setStoreName(courseOfStore.getStoreName());
- responses.add(response);
+ if (couponStoreIds.size() > 0 ){
+ for (Integer couponStoreId : couponStoreIds) {
+ StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreId);
+ if(ToolUtil.isNotEmpty(courseOfStore)){
+ StoreResponse response = new StoreResponse();
+ response.setStoreId(couponStoreId);
+ response.setStoreName(courseOfStore.getStoreName());
+ responses.add(response);
+ }
}
}
+
}else {
List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerId);
- for (Integer integer : integers) {
- StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integer);
- if(ToolUtil.isNotEmpty(courseOfStore)){
- StoreResponse response = new StoreResponse();
- response.setStoreId(integer);
- response.setStoreName(courseOfStore.getStoreName());
- responses.add(response);
+ if (integers.size() > 0 ){
+ for (Integer integer : integers) {
+ StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integer);
+ if(ToolUtil.isNotEmpty(courseOfStore)){
+ StoreResponse response = new StoreResponse();
+ response.setStoreId(integer);
+ response.setStoreName(courseOfStore.getStoreName());
+ responses.add(response);
+ }
}
}
}
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 dce6685..857f6f4 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
@@ -235,10 +235,13 @@
}
detailsVo.setCost(merchandise.getPrice());
if (merchandise.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
detailsVo.setBelongs("全国通用");
}else if (merchandise.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
detailsVo.setBelongs(merchandise.getProvince()+"|"+merchandise.getCity() + "用户可用");
}else {
+ detailsVo.setExchangeAddrType(3);
List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
.eq("pointsMerchandiseId",merchandise.getId() ));
PointsMerchandiseStore pointsMerchandiseStore = list.get(0);
@@ -286,14 +289,17 @@
detailsVo.setCash(coupon.getCash());
}
if (coupon.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
detailsVo.setBelongs("全国通用");
}else if (coupon.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
List<CouponCity> list = ccityService.list(new LambdaQueryWrapper<CouponCity>()
.eq(CouponCity::getCouponId, coupon.getId()));
if (list.size() > 0){
detailsVo.setBelongs(list.get(0).getProvince()+"|"+list.get(0).getCity() + "用户可用");
}
}else {
+ detailsVo.setExchangeAddrType(3);
List<CouponStore> list = cstoreService.list(new QueryWrapper<CouponStore>()
.eq("couponId",coupon.getId() ));
StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(list.get(0).getStoreId());
--
Gitblit v1.7.1