From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 10 ++++++++++
1 files changed, 10 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 1e517a9..0dfcc25 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){
@@ -530,6 +534,10 @@
}else {
+ // ?
+ pointsMerchandise.setShelves(storeId);
+ pointsMerchandise.setUseScope(3);
+
Integer id = pointMercharsClient.add(pointsMerchandise);
}
return new SuccessTip<>();
@@ -641,6 +649,8 @@
public String payOfDetails(@PathVariable(value = "id") Integer id,Model model) {
System.out.println(id);
model.addAttribute("id",id);
+ Coupon coupon = client.queryCouponById(id);
+ model.addAttribute("type",coupon.getType());
return PREFIX + "TGoods_pay.html";
}
/**
--
Gitblit v1.7.1