From c743f4413a00fc063bbbd9d851b6d0c3fff10581 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 10:04:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index e650d67..202b658 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.feignClient.activity.CouponClient;
+import com.dsh.course.feignClient.activity.model.CouponListOfSearch;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
import org.apache.commons.beanutils.ConvertUtils;
@@ -10,6 +12,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -27,6 +30,10 @@
private String PREFIX = "/system/tCoupon/";
+
+ @Resource
+ private CouponClient client;
+
/**
* 跳转到优惠券管理首页
*/
@@ -40,7 +47,7 @@
*/
@RequestMapping("/coupon_add")
public String memberCouponAdd() {
- return PREFIX + "coupon_add.html";
+ return PREFIX + "TCouponAdd.html";
}
/**
@@ -48,11 +55,17 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object listOfDatas(String member, Integer type, Integer distributionMethod , Integer userPopulation, Integer status, Integer state) {
+ public Object listOfDatas(String name, Integer type, Integer distributionMethod , Integer userPopulation, Integer status, Integer state) {
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String, Object>> mapList = null;
- page.setRecords(mapList);
- return page.getRecords();
+ CouponListOfSearch ofSearch = new CouponListOfSearch();
+ ofSearch.setPage(page);
+ ofSearch.setName(name);
+ ofSearch.setType(type);
+ ofSearch.setDistributionMethod(distributionMethod);
+ ofSearch.setUserPopulation(userPopulation);
+ ofSearch.setStatus(status);
+ ofSearch.setState(state);
+ return client.getCouponListOfSearch(ofSearch);
}
--
Gitblit v1.7.1