From 1e790795f4e2c365f604ecc0fc1b290e3ff3c35f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 20 十月 2023 09:34:22 +0800
Subject: [PATCH] 更新bug

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 49341f6..03f305a 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
@@ -629,6 +629,10 @@
             joinPlayPaiVo.setLat(s.getLat());
             joinPlayPaiVo.setStoreId(s.getId());
             joinPlayPaiVo.setPhone(s.getPhone());
+            joinPlayPaiVo.setProvince(s.getProvince());
+            joinPlayPaiVo.setProvinceCode(s.getProvinceCode());
+            joinPlayPaiVo.setCity(s.getCity());
+            joinPlayPaiVo.setCityCode(s.getCityCode());
         }
         return joinPlayPaiVo;
     }
@@ -1072,6 +1076,9 @@
         if (ToolUtil.isNotEmpty(count) && count >= merchandise.getPickUpQuantity()){
             return ResultUtil.error("超过限领数量");
         }
+        if (ToolUtil.isNotEmpty(count) && count >= merchandise.getQuantityIssued()){
+            return ResultUtil.error("超过发放数量");
+        }
 
         for (int i = 0; i < goodsNums; i++) {
 //            新增积分商品兑换记录

--
Gitblit v1.7.1