From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 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 c27a8fc..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,9 +11,17 @@
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;
import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -33,6 +42,12 @@
@Resource
private CouponClient client;
+ @Autowired
+ private IUserService userService;
+ @Autowired
+ private TOperatorService operatorService;
+ @Autowired
+ private IStoreService storeService;
/**
* 优惠券审核列表页
@@ -43,7 +58,15 @@
}
-
+ /**
+ * 获取根据门店id 获取店长信息
+ */
+ @RequestMapping(value = "/getStoreInfo")
+ @ResponseBody
+ public String getStoreInfo(@RequestBody Integer id) {
+ User byId = userService.getById(id);
+ return byId.getName() + "-" + byId.getAccount();
+ }
/**
* 获取 优惠券审核列表
*/
@@ -58,14 +81,51 @@
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;
}
/**
* 获取 优惠券审核详情
*/
@RequestMapping(value = "/couponOfDetail/{id}")
- @ResponseBody
public String detailOfCoupon(@PathVariable Integer id, Model model){
Map<String, Object> stringObjectMap = client.queryCouponExamineDetail(id);
model.addAttribute(stringObjectMap);
@@ -77,7 +137,6 @@
* 获取 优惠券审核详情
*/
@RequestMapping(value = "/couponExaminePage/{id}")
- @ResponseBody
public String couponExaminePage(@PathVariable Integer id, Model model){
model.addAttribute("id",id);
return PREFIX + "TCouponExamine.html";
@@ -87,13 +146,13 @@
@RequestMapping(value = "/examine")
@ResponseBody
- public Object examine(Integer couponOfId, Integer state, String remark) {
- Coupon coupon = client.queryCouponById(couponOfId);
+ public Object examine(Integer id, Integer state, String remark) {
+ Coupon coupon = client.queryCouponById(id);
try {
- if (state == 1) {
+ if (state == 2) {
coupon.setAuditStatus(2);
}
- if (state == 2) {
+ if (state == 3) {
coupon.setAuditStatus(3);
coupon.setAuditRemark(remark);
}
--
Gitblit v1.7.1