From b87922420561a35c1e99b67fb6caf3fe30bc8ccf Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 16 十一月 2023 08:57:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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..7786c56 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
@@ -137,7 +137,7 @@
Integer coursePackageId = pointMercharsVo.getCoursePackageId();
List<String> name = courseClient.queryPackageById(coursePackageId);
Integer coursePackageId1 = pointMercharsVo.getCoursePackageId();
- String classHours = courseClient.getHours(coursePackageId1);
+ List<Integer> classHours = courseClient.getHours(coursePackageId1);
model.addAttribute("typeName",name.get(0));
model.addAttribute("pageName",name.get(1));
model.addAttribute("classHours",classHours);
@@ -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++) {
@@ -521,7 +527,18 @@
}catch (Exception e){
e.printStackTrace();
}
+ }else if(useScope==1){
+ Integer id = pointMercharsClient.add(pointsMerchandise);
}
+
+
+
+ }else {
+ // ?
+ pointsMerchandise.setShelves(storeId);
+ pointsMerchandise.setUseScope(3);
+
+ Integer id = pointMercharsClient.add(pointsMerchandise);
}
return new SuccessTip<>();
@@ -632,6 +649,8 @@
public String payOfDetails(@PathVariable(value = "id") Integer id,Model model) {
System.out.println(id);
model.addAttribute("id",id);
+ PointsMerchandise byId = pointMercharsClient.getById(id);
+ model.addAttribute("type",byId.getType());
return PREFIX + "TGoods_pay.html";
}
/**
--
Gitblit v1.7.1