From 1e64ef03770f4e3a7f357049a6fe744f39c2c4b6 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期二, 21 十一月 2023 09:12:20 +0800 Subject: [PATCH] 后台bug修改 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 13 ++++++++++++- 1 files changed, 12 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 1e517a9..86ed776 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 @@ -89,6 +89,7 @@ } @RequestMapping("/audit") public String audit(Model model) { + return PREFIX1 + "TGoodsAudit.html"; } @@ -137,7 +138,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 +411,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 +483,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 +535,10 @@ }else { + // ? + pointsMerchandise.setShelves(storeId); + pointsMerchandise.setUseScope(3); + Integer id = pointMercharsClient.add(pointsMerchandise); } return new SuccessTip<>(); @@ -641,6 +650,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