From 2b75097b5a3630ce29410c3a8d13ef1ceff8d0d4 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 27 六月 2025 15:16:35 +0800 Subject: [PATCH] 管理后台二期 --- ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java index fa1e918..d4a84af 100644 --- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java +++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java @@ -1,5 +1,8 @@ package com.stylefeng.guns.modular.system.controller.general; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; @@ -9,6 +12,8 @@ import com.stylefeng.guns.core.util.DateUtil; import com.stylefeng.guns.core.util.SinataUtil; import com.stylefeng.guns.modular.system.model.SysRedPacketRecord; +import com.stylefeng.guns.modular.system.model.TRegion; +import com.stylefeng.guns.modular.system.service.ITRegionService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -21,7 +26,9 @@ import com.stylefeng.guns.modular.system.service.ISysCouponRecordService; import java.util.Date; +import java.util.List; import java.util.Map; +import java.util.Optional; /** * 控制器 @@ -37,6 +44,9 @@ @Autowired private ISysCouponRecordService sysCouponRecordService; + + @Autowired + private ITRegionService tRegionService; /** * 跳转到首页 @@ -50,7 +60,9 @@ * 跳转到添加 */ @RequestMapping("/sysCouponRecord_add") - public String sysCouponRecordAdd() { + public String sysCouponRecordAdd(Model model) { + List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0)); + model.addAttribute("provinceList",provinceList); return PREFIX + "sysCouponRecord_add.html"; } @@ -62,6 +74,8 @@ SysCouponRecord sysCouponRecord = sysCouponRecordService.selectById(sysCouponRecordId); model.addAttribute("item",sysCouponRecord); LogObjectHolder.me().set(sysCouponRecord); + List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0)); + model.addAttribute("provinceList",provinceList); return PREFIX + "sysCouponRecord_edit.html"; } @@ -90,8 +104,11 @@ if(SinataUtil.isNotEmpty(couponType)){ wrapper.eq("couponType",couponType); } - wrapper.eq("companyId",ShiroKit.getUser().getObjectId()); - wrapper.eq("companyType",ShiroKit.getUser().getRoleType()); + Integer roleType = ShiroKit.getUser().getRoleType(); + if(roleType != 1){ + wrapper.eq("companyId",ShiroKit.getUser().getObjectId()); + wrapper.eq("companyType",ShiroKit.getUser().getRoleType()); + } wrapper.orderBy("id",false); return super.packForBT(sysCouponRecordService.selectPage(page,wrapper)); } @@ -105,6 +122,22 @@ sysCouponRecord.setInsertTime(new Date()); sysCouponRecord.setCompanyId(ShiroKit.getUser().getObjectId()); sysCouponRecord.setCompanyType(ShiroKit.getUser().getRoleType()); + String citys = sysCouponRecord.getCitys(); + JSONArray jsonArray = JSON.parseArray(citys); + JSONArray citys_list = new JSONArray(); + List<TRegion> tRegions = tRegionService.selectList(null); + for (int i = 0; i < jsonArray.size(); i++) { + Integer integer = jsonArray.getInteger(i); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("code", integer); + Optional<TRegion> first = tRegions.stream().filter(s->s.getCode().equals(integer.toString())).findFirst(); + if(first.isPresent()){ + TRegion tRegion = first.get(); + jsonObject.put("name", tRegion.getName()); + } + citys_list.add(jsonObject); + } + sysCouponRecord.setCitys(citys_list.toString()); sysCouponRecordService.insert(sysCouponRecord); return SUCCESS_TIP; } @@ -125,6 +158,22 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(SysCouponRecord sysCouponRecord) { + String citys = sysCouponRecord.getCitys(); + JSONArray jsonArray = JSON.parseArray(citys); + JSONArray citys_list = new JSONArray(); + List<TRegion> tRegions = tRegionService.selectList(null); + for (int i = 0; i < jsonArray.size(); i++) { + Integer integer = jsonArray.getInteger(i); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("code", integer); + Optional<TRegion> first = tRegions.stream().filter(s->s.getCode().equals(integer.toString())).findFirst(); + if(first.isPresent()){ + TRegion tRegion = first.get(); + jsonObject.put("name", tRegion.getName()); + } + citys_list.add(jsonObject); + } + sysCouponRecord.setCitys(citys_list.toString()); sysCouponRecordService.updateById(sysCouponRecord); return SUCCESS_TIP; } -- Gitblit v1.7.1