From fc5fcf753994834a72564944c117d5ec850f268c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 19:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 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 ee1de5b..059366b 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,9 +1,20 @@
package com.dsh.guns.modular.system.controller.code;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.feignClient.activity.CouponClient;
+import com.dsh.course.feignClient.activity.model.CouponExamineListSearch;
+import com.dsh.course.feignClient.activity.model.CouponListOfSearch;
+import com.dsh.guns.core.common.constant.factory.PageFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* 优惠券审核 控制器
@@ -16,6 +27,9 @@
private String PREFIX = "/system/tCouponExamine/";
+ @Resource
+ private CouponClient client;
+
/**
* 优惠券审核列表页
*/
@@ -25,4 +39,40 @@
}
+
+ /**
+ * 获取 优惠券审核列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object listOfDatas(String name, Integer type, Integer distributionMethod , Integer userPopulation, Integer auditStatus) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ CouponExamineListSearch ofSearch = new CouponExamineListSearch();
+ ofSearch.setPage(page);
+ ofSearch.setName(name);
+ ofSearch.setType(type);
+ 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;
+ }
+
+ /**
+ * 获取 优惠券审核详情
+ */
+ @RequestMapping(value = "/couponOfDetail/{id}")
+ @ResponseBody
+ public Object detailOfCoupon(@PathVariable Integer id){
+ Map<String,Object> couponMap = client.queryCouponExamineDetail(id);
+ return null;// TODO: 2023/7/31
+ }
+
}
--
Gitblit v1.7.1