From 565547a1d026a9bcff26f3e0edaf079bdb7a55d4 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 26 十月 2023 08:55:52 +0800
Subject: [PATCH] 10.26

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 6db3b75..606f8e5 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
@@ -410,6 +410,7 @@
         stringObjectHashMap.put("cover",cover);
         stringObjectHashMap.put("productImages",productImages);
         stringObjectHashMap.put("sort",sort);
+        stringObjectHashMap.put("type",UserExt.getUser().getObjectType());
         System.out.println(stringObjectHashMap);
         pointMercharsClient.updateGoodsDetail(stringObjectHashMap);
         return new SuccessTip<>();
@@ -481,6 +482,9 @@
         pointsMerchandise.setState(1);
         pointsMerchandise.setInsertTime(new Date());
         pointsMerchandise.setCoursePackageConfigId(coursePackageConfigId);
+        if(UserExt.getUser().getObjectType()!=1){
+            pointsMerchandise.setStatus(2);
+        }
         // 代替storeId
         pointsMerchandise.setShelves(1);
         if(typeAll!=2){
@@ -499,7 +503,9 @@
                 }
                 pointMercharsClient.addCitys(objects);
             }else if(useScope==3){
-
+                if(UserExt.getUser().getObjectType()==3){
+                    storeIds=UserExt.getUser().getObjectId().toString();
+                }
                 Integer oid=null;
                 String[] split = storeIds.split(",");
                 for (int i = 0; i < split.length; i++) {

--
Gitblit v1.7.1