From 4fa2598a31a505927eeb585ae25a3bb6902041cd Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期五, 04 八月 2023 12:11:39 +0800 Subject: [PATCH] app端:课后练习视频列表的bug --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 95 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 90 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 8c343e3..37a4b49 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 @@ -1,19 +1,29 @@ package com.dsh.guns.modular.system.controller.code; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.course.feignClient.activity.CouponClient; import com.dsh.course.feignClient.activity.model.CouponListOfSearch; +import com.dsh.guns.config.UserExt; import com.dsh.guns.core.common.constant.factory.PageFactory; import com.dsh.guns.core.util.ToolUtil; +import com.dsh.guns.modular.system.model.Region; +import com.dsh.guns.modular.system.service.IRegionService; +import com.dsh.guns.modular.system.service.IStoreService; +import com.dsh.guns.modular.system.util.OBSUploadUtil; import org.apache.commons.beanutils.ConvertUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.IOException; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,7 +42,13 @@ @Resource + private IRegionService regiService; + + @Resource private CouponClient client; + + @Resource + private IStoreService storeService; /** * 跳转到优惠券管理首页 @@ -46,8 +62,33 @@ * 跳转到添加 */ @RequestMapping("/coupon_add") - public String memberCouponAdd() { - return PREFIX + "coupon_add.html"; + public String memberCouponAdd(Model model) { + Integer objectType = UserExt.getUser().getObjectType(); + System.out.println(objectType); + model.addAttribute("userType",objectType); + return PREFIX + "TCouponAdd.html"; + } + + + + /** + * 跳转到门店管理列表页 + */ + @RequestMapping("/storeList") + public String storePage(Model model) { + return PREFIX + "TStoreList.html"; + } + + @RequestMapping("/storeList") + @ResponseBody + public Object listOfStore(Integer province,Integer cityCode,Integer cityManagerId,String storeName){ + Region provinceRegion = regiService.getById(province); + Region cityRegion = regiService.getById(cityCode); + Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(); + List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceRegion.getCode(),cityRegion.getCode(),cityManagerId,storeName,page); + + + return null; } /** @@ -65,10 +106,54 @@ ofSearch.setUserPopulation(userPopulation); ofSearch.setStatus(status); ofSearch.setState(state); - List<Map<String, Object>> mapList = client.getCouponListOfSearch(ofSearch); - page.setRecords(mapList); - return page.getRecords(); + return client.getCouponListOfSearch(ofSearch); + } + + @RequestMapping(value = "/getProvince") + @ResponseBody + public Object getProvince(){ + return regiService.list(new LambdaQueryWrapper<Region>() + .eq(Region::getParentId,0)); } + @RequestMapping(value = "/getCity") + @ResponseBody + public Object getCity(Integer province){ + return regiService.list(new LambdaQueryWrapper<Region>() + .eq(Region::getParentId,province)); + } + + @RequestMapping(value = "/uploadPic") + @ResponseBody + public Object add(@RequestParam("file") MultipartFile imgFile) throws IOException { + String originalFilename = imgFile.getOriginalFilename(); + String newName = originalFilename.substring(imgFile.getOriginalFilename().lastIndexOf(".")); + String url = OBSUploadUtil.inputStreamUpload(imgFile); + Map<String, String> map = new HashMap<String, String>(); + //是否上传成功 + map.put("state", "SUCCESS"); + //现在文件名称 + map.put("title", newName); + //文件原名称 + map.put("original", originalFilename); + //文件类型 .+后缀名 + map.put("type", originalFilename.substring(imgFile.getOriginalFilename().lastIndexOf("."))); + //文件路径 + map.put("url", url); + //文件大小(字节数) + map.put("size", imgFile.getSize() + ""); + System.out.println(map); + return url; + } + + /** + * 提交添加 + */ + @RequestMapping(value = "/commitData") + public void commitData(){ + + + + } } -- Gitblit v1.7.1