From 31ce6be2d56798d9509e6d90335999064351f7f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 16:06:26 +0800
Subject: [PATCH] 12.10
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java
index fa1e918..133bc8f 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java
@@ -9,6 +9,8 @@
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
+import com.stylefeng.guns.modular.system.model.UserCouponRecord;
+import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -21,6 +23,7 @@
import com.stylefeng.guns.modular.system.service.ISysCouponRecordService;
import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -96,6 +99,42 @@
return super.packForBT(sysCouponRecordService.selectPage(page,wrapper));
}
+ @Autowired
+ private IUserCouponRecordService userCouponRecordService;
+ @RequestMapping(value = "/list1")
+ @ResponseBody
+ public Object list1(String createTime,Integer couponUseType,Integer couponType) {
+
+ Date startTimes = null;
+ Date endTimes = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
+ endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
+ }
+ Page<SysCouponRecord> page = new PageFactory<SysCouponRecord>().defaultPage();
+ Wrapper wrapper = new EntityWrapper<SysCouponRecord>();
+ if(SinataUtil.isNotEmpty(createTime)){
+ wrapper.between("insertTime",startTimes,endTimes);
+ }
+ if(SinataUtil.isNotEmpty(couponUseType)){
+ wrapper.eq("couponUseType",couponUseType);
+ }
+ if(SinataUtil.isNotEmpty(couponType)){
+ wrapper.eq("couponType",couponType);
+ }
+ wrapper.eq("companyId",ShiroKit.getUser().getObjectId());
+ wrapper.eq("companyType",ShiroKit.getUser().getRoleType());
+ wrapper.orderBy("id",false);
+ Page page1 = sysCouponRecordService.selectPage(page, wrapper);
+ List<SysCouponRecord> records = page1.getRecords();
+ for (SysCouponRecord record : records) {
+ int couponId = userCouponRecordService.selectCount(new EntityWrapper<UserCouponRecord>().eq("couponId", record.getId()));
+ record.setReceive(couponId);
+ }
+ return super.packForBT(page1);
+ }
+
/**
* 新增
*/
--
Gitblit v1.7.1