From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 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 059366b..c27a8fc 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
@@ -3,9 +3,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.activity.CouponClient;
+import com.dsh.course.feignClient.activity.model.Coupon;
import com.dsh.course.feignClient.activity.model.CouponExamineListSearch;
import com.dsh.course.feignClient.activity.model.CouponListOfSearch;
+import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.common.constant.factory.PageFactory;
+import com.dsh.guns.core.exception.GunsException;
+import com.dsh.guns.core.util.ToolUtil;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
@@ -22,7 +26,7 @@
@Controller
@RequestMapping("/tCouponExamine")
-public class TCouponExamineController {
+public class TCouponExamineController extends BaseController {
private String PREFIX = "/system/tCouponExamine/";
@@ -35,7 +39,7 @@
*/
@RequestMapping("")
public String index(Model model) {
- return PREFIX + "TCouponExamine.html";
+ return PREFIX + "TCouponExamineList.html";
}
@@ -54,15 +58,7 @@
ofSearch.setDistributionMethod(distributionMethod);
ofSearch.setUserPopulation(userPopulation);
ofSearch.setAuditStatus(auditStatus);
- List<Map<String, Object>> couponExamineListOfSearch = client.getCouponExamineListOfSearch(ofSearch);
- if (couponExamineListOfSearch.size() > 0){
- for (Map<String, Object> examineListOfSearch : couponExamineListOfSearch) {
- examineListOfSearch.put("province","");
- examineListOfSearch.put("city","");
- examineListOfSearch.put("account","");
- }
- }
- return couponExamineListOfSearch;
+ return client.getCouponExamineListOfSearch(ofSearch);
}
/**
@@ -70,9 +66,43 @@
*/
@RequestMapping(value = "/couponOfDetail/{id}")
@ResponseBody
- public Object detailOfCoupon(@PathVariable Integer id){
- Map<String,Object> couponMap = client.queryCouponExamineDetail(id);
- return null;// TODO: 2023/7/31
+ public String detailOfCoupon(@PathVariable Integer id, Model model){
+ Map<String, Object> stringObjectMap = client.queryCouponExamineDetail(id);
+ model.addAttribute(stringObjectMap);
+ return PREFIX + "TCouponExamineInfo.html";
+ }
+
+
+ /**
+ * 获取 优惠券审核详情
+ */
+ @RequestMapping(value = "/couponExaminePage/{id}")
+ @ResponseBody
+ public String couponExaminePage(@PathVariable Integer id, Model model){
+ model.addAttribute("id",id);
+ return PREFIX + "TCouponExamine.html";
+ }
+
+
+
+ @RequestMapping(value = "/examine")
+ @ResponseBody
+ public Object examine(Integer couponOfId, Integer state, String remark) {
+ Coupon coupon = client.queryCouponById(couponOfId);
+ try {
+ if (state == 1) {
+ coupon.setAuditStatus(2);
+ }
+ if (state == 2) {
+ coupon.setAuditStatus(3);
+ coupon.setAuditRemark(remark);
+ }
+ client.updateCouponData(coupon);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
}
}
--
Gitblit v1.7.1