From 5af417d60d0cc3cd37afacead01c01ac2d7b6970 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 24 十月 2023 16:58:27 +0800
Subject: [PATCH] 10.24。1

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 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 8e1ad7a..57b261b 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
@@ -1105,24 +1105,7 @@
             return ResultUtil.error("超过发放数量");
         }
 
-        for (int i = 0; i < goodsNums; i++) {
-//            新增积分商品兑换记录
-            UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
-            pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
-            pointsMerchandise.setUserId(userIdFormRedis);
-            pointsMerchandise.setStatus(1);
-            pointsMerchandise.setState(1);
-            if (merchandise.getUseScope() == 3){
-                if (exchangeType.getGoodsType() == 2){
-                    CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
-                    pointsMerchandise.setStoreId(coursePackage.getStoreId());
-                }else {
-                    pointsMerchandise.setStoreId(exchangeType.getStoreId());
-                }
-            }
-            pointsMerchandise.setCode(code);
-            mcClient.saveDetailsUserPointMercase(pointsMerchandise);
-        }
+
 
         switch (exchangeType.getExchangeType()){
 //            积分
@@ -1228,6 +1211,26 @@
             default:
                 break;
         }
+
+        for (int i = 0; i < goodsNums; i++) {
+//            新增积分商品兑换记录
+            UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
+            pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
+            pointsMerchandise.setUserId(userIdFormRedis);
+            pointsMerchandise.setStatus(1);
+            pointsMerchandise.setState(1);
+            if (merchandise.getUseScope() == 3){
+                if (exchangeType.getGoodsType() == 2){
+                    CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
+                    pointsMerchandise.setStoreId(coursePackage.getStoreId());
+                }else {
+                    pointsMerchandise.setStoreId(exchangeType.getStoreId());
+                }
+            }
+            pointsMerchandise.setCode(code);
+            mcClient.saveDetailsUserPointMercase(pointsMerchandise);
+        }
+
         return ResultUtil.success();
     }
 

--
Gitblit v1.7.1