From aff43f8ebe077b9daf097e1c583304c0252bf440 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 18:49:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 4caf30c..6db3b75 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -521,7 +521,14 @@
                 }catch (Exception e){
                     e.printStackTrace();
                 }
+            }else if(useScope==1){
+                Integer id = pointMercharsClient.add(pointsMerchandise);
             }
+
+
+
+        }else {
+            Integer id = pointMercharsClient.add(pointsMerchandise);
         }
         return new SuccessTip<>();
 

--
Gitblit v1.7.1