From a91463ee1c2bf2ef932bd1c5c061b225b2c83b77 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 08 八月 2023 17:11:19 +0800
Subject: [PATCH] 修改积分变动记录的实体类,增加变动类型字段

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 c4a005c..7406b63 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
@@ -671,9 +671,9 @@
         CommodityRequest commodityRequest = new CommodityRequest();
         commodityRequest.setLon(request.getLon());
         commodityRequest.setLat(request.getLat());
-        List<PointsMerchandise> vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
-        if (vicinityGoods.size() > 0) {
-            for (PointsMerchandise vicinityGood : vicinityGoods) {
+        PointMerchandiseVo vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
+        if (ToolUtil.isNotEmpty(vicinityGoods.getMerchandises())) {
+            for (PointsMerchandise vicinityGood : vicinityGoods.getMerchandises()) {
                 Goods commodity = new Goods();
                 switch (vicinityGood.getType()) {
                     case 1:
@@ -882,7 +882,7 @@
 
         this.baseMapper.updateById(tAppUser);
 //        现金支付
-        if (exchangeType == 2) {
+        if (exchangeType == 2 || exchangeType == 3) {
             switch (goodsType) {
                 case 2:
                     for (int i = 0; i < stuIds.size(); i++) {

--
Gitblit v1.7.1