From 94f34a5cf9ab374afbaefd566bc0a3dc8a4616dd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:37 +0800
Subject: [PATCH] 同步

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 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 a7d0bc2..8881934 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
@@ -719,7 +719,11 @@
         IndexOfUserBenefirVo benefirVo = new IndexOfUserBenefirVo();
 
         TAppUser appUser = this.getById(appUserId);
-        benefirVo.setUserHeadImg(appUser.getHeadImg());
+        if (appUser.getHeadImg()!=null) {
+            benefirVo.setUserHeadImg(appUser.getHeadImg());
+        }else {
+            benefirVo.setUserHeadImg("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/630864764d3c4e98822ff976a2389559.jpg");
+        }
         benefirVo.setUserName(appUser.getName());
         benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
         benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
@@ -1827,6 +1831,9 @@
     @Override
     public ResultUtil exchangeAddPaymentCallback(String code, String orderNumber,Integer payType) {
         List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code);
+        if(userPointsMerchandises.get(0).getPayStatus() == 2){
+            return ResultUtil.success();
+        }
         if (userPointsMerchandises.size() > 1){
             for (int i = 0; i < userPointsMerchandises.size(); i++) {
                 userPointsMerchandises.get(i).setOrderNumber(orderNumber+ "-" + (i+1));

--
Gitblit v1.7.1