From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 22318d9..cb753c5 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
@@ -145,10 +145,16 @@
model.addAttribute("shopName",byId.getName());
Integer coursePackageId = pointMercharsVo.getCoursePackageId();
List<String> name = courseClient.queryPackageById(coursePackageId);
+ if(null != name){
+ model.addAttribute("typeName",name.get(0));
+ model.addAttribute("pageName",name.get(1));
+ }else{
+ model.addAttribute("typeName", "");
+ model.addAttribute("pageName", "");
+ }
Integer coursePackageId1 = pointMercharsVo.getCoursePackageId();
List<CoursePackagePaymentConfig> hoursByPackageId = courseClient.getHoursByPackageId(coursePackageId1);
- model.addAttribute("typeName",name.get(0));
- model.addAttribute("pageName",name.get(1));
+
model.addAttribute("classHours",hoursByPackageId);
String productImages = pointMercharsVo.getProductImages();
ArrayList<String> strings = new ArrayList<>();
@@ -416,8 +422,10 @@
*/
@PostMapping(value = "/update")
@ResponseBody
- public Object update( Integer pointMerchandiseId,Integer quantityIssued,Integer pickUpQuantity,String redemptionInstructions,String cover,String productImages,Integer sort){
+ public Object update(String name, Integer pointMerchandiseId,Integer quantityIssued,Integer pickUpQuantity,
+ String redemptionInstructions,String cover,String productImages,Integer sort){
Map<String, Object> stringObjectHashMap = new HashMap<>();
+ stringObjectHashMap.put("name",name);
stringObjectHashMap.put("pointMerchandiseId",pointMerchandiseId);
stringObjectHashMap.put("quantityIssued",quantityIssued);
stringObjectHashMap.put("pickUpQuantity",pickUpQuantity);
@@ -481,6 +489,8 @@
}
}
PointsMerchandise pointsMerchandise = new PointsMerchandise();
+ pointsMerchandise.setAddUserId(UserExt.getUser().getObjectId());
+ pointsMerchandise.setAddType(UserExt.getUser().getObjectType());
pointsMerchandise.setType(typeAll);
pointsMerchandise.setName(name);
pointsMerchandise.setCoursePackageId(coursePackageId);
@@ -501,7 +511,19 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
pointsMerchandise.setStartTime(format.parse(startTime.split(" - ")[0]));
pointsMerchandise.setEndTime(format.parse(startTime.split(" - ")[1]));
- pointsMerchandise.setUseScope(useScope);
+ if (UserExt.getUser().getObjectType()==3){
+ if (StringUtils.hasLength(sites)){
+ useScope = 4;
+ storeIds="";
+ pointsMerchandise.setUseScope(4);
+ }else{
+ useScope = 3;
+ pointsMerchandise.setUseScope(3);
+ }
+ }else{
+ pointsMerchandise.setUseScope(useScope);
+
+ }
if(ToolUtil.isNotEmpty(provinceCode)){
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, provinceCode));
pointsMerchandise.setProvinceCode(provinceCode);
--
Gitblit v1.7.1