From 3b21bc01d0b202273552d4c245edc474b3e680eb Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期日, 17 八月 2025 21:29:13 +0800 Subject: [PATCH] 管理后台会员管理 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java index bc07141..0998279 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java @@ -11,10 +11,7 @@ import com.dsh.course.feignClient.account.model.QueryByNamePhone; import com.dsh.course.feignClient.account.model.TAppUser; import com.dsh.course.feignClient.activity.CouponClient; -import com.dsh.course.feignClient.activity.model.Coupon; -import com.dsh.course.feignClient.activity.model.CouponCity; -import com.dsh.course.feignClient.activity.model.CouponListOfSearch; -import com.dsh.course.feignClient.activity.model.CouponRecordQuery; +import com.dsh.course.feignClient.activity.model.*; import com.dsh.guns.config.UserExt; import com.dsh.guns.core.base.tips.SuccessTip; import com.dsh.guns.core.common.constant.factory.PageFactory; @@ -85,7 +82,9 @@ public String memberCouponAdd(Model model) { Integer objectType = UserExt.getUser().getObjectType(); System.out.println(objectType); + List<PointsMerchandise> pointsMerchandises = client.goodsList(); model.addAttribute("userType",objectType); + model.addAttribute("goods",pointsMerchandises); return PREFIX + "TCouponAdd.html"; } @@ -168,7 +167,12 @@ return PREFIX + "TCouponInfo.html"; } - + // 积分商品活动状态 未开始和已开始状态 上架 + @RequestMapping("/goodsList") + @ResponseBody + public Object goodsList() { + return client.goodsList(); + } /** * 跳转到门店管理列表页 @@ -417,6 +421,8 @@ if (imgFile != null){ String originalFilename = imgFile.getOriginalFilename(); String newName = originalFilename.substring(imgFile.getOriginalFilename().lastIndexOf(".")); + + String url = OssUploadUtil.ossUpload("img/",imgFile); Map<String, String> map = new HashMap<String, String>(); //是否上传成功 -- Gitblit v1.7.1