From ddbb38c54db9c3670e5ff53f4bf713525de1099d Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期二, 14 十一月 2023 09:12:10 +0800 Subject: [PATCH] 后台bug修改 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java index b114e0e..5baf40a 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java @@ -1,6 +1,7 @@ package com.dsh.guns.modular.system.controller.code; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.course.feignClient.activity.CouponClient; import com.dsh.course.feignClient.activity.model.Coupon; @@ -10,8 +11,12 @@ import com.dsh.guns.core.common.constant.factory.PageFactory; import com.dsh.guns.core.exception.GunsException; import com.dsh.guns.core.util.ToolUtil; +import com.dsh.guns.modular.system.model.TOperator; +import com.dsh.guns.modular.system.model.TStore; import com.dsh.guns.modular.system.model.User; +import com.dsh.guns.modular.system.service.IStoreService; import com.dsh.guns.modular.system.service.IUserService; +import com.dsh.guns.modular.system.service.TOperatorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -39,6 +44,10 @@ private CouponClient client; @Autowired private IUserService userService; + @Autowired + private TOperatorService operatorService; + @Autowired + private IStoreService storeService; /** * 优惠券审核列表页 @@ -72,7 +81,45 @@ ofSearch.setDistributionMethod(distributionMethod); ofSearch.setUserPopulation(userPopulation); ofSearch.setAuditStatus(auditStatus); - return client.getCouponExamineListOfSearch(ofSearch); + List<Map<String, Object>> res = client.getCouponExamineListOfSearch(ofSearch); + for (Map<String, Object> re : res) { + if (re.get("publisherType")!=null){ + + } + switch (Integer.valueOf(re.get("publisherType").toString())){ + case 1: + // 运营商添加 + if (re.get("cityManagerId")!=null){ + TOperator one = operatorService.getOne(new QueryWrapper<TOperator>() + .eq("id", Integer.valueOf(re.get("cityManagerId").toString()))); + if (one!=null){ + User id = userService.getOne(new QueryWrapper<User>().eq("id", one.getUserId())); + if (id!=null){ + re.put("account",one.getName()+"-"+id.getPhone()); + } + } + } + break; + case 2: + re.put("account","平台"); + // 平台添加 + break; + case 3: + // 门店添加 + if (re.get("cityManagerId")!=null){ + TStore one = storeService.getOne(new QueryWrapper<TStore>() + .eq("id", Integer.valueOf(re.get("cityManagerId").toString()))); + if (one!=null){ + User id = userService.getOne(new QueryWrapper<User>().eq("id", one.getStoreStaffId())); + if (id!=null){ + re.put("account",one.getName()+"-"+id.getPhone()); + } + } + } + break; + } + } + return res; } /** -- Gitblit v1.7.1