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 |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 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 f0b1108..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,6 +868,23 @@
         if (ToolUtil.isEmpty(tAppUser)){
             return ResultUtil.error("用户不存在");
         }
+//        todo 积分商品明细 查询是否超出限领数量
+        switch (exchangeType.getGoodsType()){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            default:
+                break;
+        }
         int goodsNums = 0;
         if (ToolUtil.isEmpty(exchangeType.getNums())){
             goodsNums = 1;
@@ -879,6 +896,7 @@
             UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
             pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
             pointsMerchandise.setUserId(userIdFormRedis);
+            pointsMerchandise.setStatus(1);
             if (merchandise.getUseScope() == 3){
                 if (exchangeType.getGoodsType() == 2){
                     CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
@@ -1316,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);
+                    }
                 }
             }
         }

--
Gitblit v1.7.1