From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改

---
 zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java b/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java
index 1703c16..997821c 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java
@@ -8,9 +8,17 @@
 import com.matrix.system.activity.dto.AddSignAwardSetDto;
 import com.matrix.system.activity.dto.BeCloseDto;
 import com.matrix.system.activity.dto.BeReadyDto;
+import com.matrix.system.activity.dto.CouponDto;
 import com.matrix.system.activity.dto.DelRowDto;
+import com.matrix.system.activity.dto.GoodsDto;
+import com.matrix.system.activity.dto.SignForUpdateDto;
+import com.matrix.system.activity.dto.SignReceiveListDto;
+import com.matrix.system.activity.dto.UpdateSignAwardSetDto;
 import com.matrix.system.activity.service.ActivitySignAwardSetService;
 import com.matrix.system.activity.vo.ActivitiesListVo;
+import com.matrix.system.activity.vo.CouponVo;
+import com.matrix.system.activity.vo.GoodsVo;
+import com.matrix.system.activity.vo.SignReceiveListVo;
 import com.matrix.system.hive.action.util.QueryUtil;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -37,6 +45,52 @@
 	public @ResponseBody
 	AjaxResult addSignAwardSet(@RequestBody AddSignAwardSetDto addSignAwardSetDto) {
 		return activitySignAwardSetService.activitySignAwardSetService(addSignAwardSetDto);
+	}
+	
+	/**
+	 * 查询优惠券
+	 */
+	@ApiOperation(value = "查询优惠券")
+	@ApiResponses({
+			@ApiResponse(code = 200, message = "OK",  response = CouponVo.class)
+	})
+	@PostMapping(value = "/selectCouponList")
+	public @ResponseBody
+	AjaxResult selectCouponList(@RequestBody CouponDto couponDto) {
+		//设置用户公司ID
+		QueryUtil.setQueryLimitCom(couponDto);
+		//排序
+		if(StringUtils.isBlank(couponDto.getSort())){
+			couponDto.setSort("create_time");
+			couponDto.setOrder("desc");
+		}
+		Page<CouponVo> page = new Page(couponDto.getPageNum(), couponDto.getPageSize());
+		IPage<CouponVo> rows = activitySignAwardSetService.selectCouponList(page,couponDto);
+		AjaxResult result = AjaxResult.buildSuccessInstance(rows.getRecords(),rows.getTotal());
+		return result;
+	}
+	
+	/**
+	 * 查询商品
+	 */
+	@ApiOperation(value = "查询商品")
+	@ApiResponses({
+			@ApiResponse(code = 200, message = "OK",  response = GoodsVo.class)
+	})
+	@PostMapping(value = "/selectGoodsList")
+	public @ResponseBody
+	AjaxResult selectGoodsList(@RequestBody GoodsDto goodsDto) {
+		//设置用户公司ID
+		QueryUtil.setQueryLimitCom(goodsDto);
+		//排序
+		if(StringUtils.isBlank(goodsDto.getSort())){
+			goodsDto.setSort("create_time");
+			goodsDto.setOrder("desc");
+		}
+		Page<GoodsVo> page = new Page(goodsDto.getPageNum(), goodsDto.getPageSize());
+		IPage<GoodsVo> rows = activitySignAwardSetService.selectGoodsList(page,goodsDto);
+		AjaxResult result = AjaxResult.buildSuccessInstance(rows.getRecords(),rows.getTotal());
+		return result;
 	}
 
 	/**
@@ -91,8 +145,48 @@
     AjaxResult beClose(@RequestBody BeCloseDto beCloseDto) {
     	return activitySignAwardSetService.beClose(beCloseDto);
     }
+    
+    /**
+	 * 活动统计
+	 */
+	@ApiOperation(value = "活动统计")
+	@ApiResponses({
+			@ApiResponse(code = 200, message = "OK",  response = SignReceiveListVo.class)
+	})
+	@PostMapping(value = "/findSignReceiveList")
+	public @ResponseBody
+	AjaxResult findSignReceiveList(@RequestBody SignReceiveListDto signReceiveListDto) {
+		//设置用户公司ID
+		QueryUtil.setQueryLimitCom(signReceiveListDto);
+		//排序
+		if(StringUtils.isBlank(signReceiveListDto.getSort())){
+			signReceiveListDto.setSort("create_time");
+			signReceiveListDto.setOrder("desc");
+		}
+		Page<SignReceiveListVo> page = new Page(signReceiveListDto.getPageNum(), signReceiveListDto.getPageSize());
+		IPage<SignReceiveListVo> rows = activitySignAwardSetService.findSignReceiveList(page,signReceiveListDto);
+		AjaxResult result = AjaxResult.buildSuccessInstance(rows.getRecords(),rows.getTotal());
+		return result;
+	}
 	
+	/**
+     *进入修改
+     */
+    @ApiOperation(value = "进入修改")
+    @PostMapping(value = "/findSignForUpdate")
+    public @ResponseBody
+    AjaxResult findSignForUpdate(@RequestBody SignForUpdateDto signForUpdateDto) {
+    	return activitySignAwardSetService.findSignForUpdate(signForUpdateDto);
+    }
 	
+    /**
+	 * 保存
+	 */
+	@PostMapping(value = "/updateSignAwardSet")
+	public @ResponseBody
+	AjaxResult updateSignAwardSet(@RequestBody UpdateSignAwardSetDto updateSignAwardSetDto) {
+		return activitySignAwardSetService.updateSignAwardSet(updateSignAwardSetDto);
+	}
 	
 	
 	

--
Gitblit v1.9.1