From 47e77742039c38f9f11ba96c93cd6560b7762e59 Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 26 Aug 2019 11:56:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=88=B8->=E6=B3=A8?= =?UTF-8?q?=E5=88=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponSendController.java | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index ae36bdf0f..00f917af1 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; @RestController @RequestMapping("/api/couponSend") @@ -46,6 +47,7 @@ public class WxCouponSendController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) public ResultData list(WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); @@ -54,9 +56,11 @@ public class WxCouponSendController extends BaseController { } wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setMerchantId(getUser().getMerchantId()); - wxCouponSend.setStatus(Objects.isNull(wxCouponSend.getStatus()) ? null : wxCouponSend.getStatus()); + if (Objects.nonNull(wxCouponSend.getExpired()) && Objects.equals(wxCouponSend.getStatus(), 0)) { + wxCouponSend.setMerchantLnventory(0); + } + wxCouponSend.setStatus(wxCouponSend.getStatus()); //库存大于0 - wxCouponSend.setMerchantLnventory(0); wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); @@ -69,10 +73,10 @@ public class WxCouponSendController extends BaseController { @ApiOperation("商户注券") @GetMapping("/handSel") @ApiImplicitParams({ - @ApiImplicitParam(name = "wxCouponSendId", value = "wxCouponSendId", dataType = "long", paramType = "query", required = true), + @ApiImplicitParam(name = "wxCouponSendIds", value = "wxCouponSendIds", dataType = "string", paramType = "query", required = true), @ApiImplicitParam(name = "cUserId", value = "用户ID", dataType = "long", paramType = "query", required = true), }) - public ResultData handSel(Long[] wxCouponSendIds, Long cUserId) { + public ResultData handSel(String[] wxCouponSendIds, Long cUserId) { logger.debug("[" + getIpAddr() + "] WxCouponSendController::handSel"); WxCUser cu = wxCUserMapper.selectByPrimaryKey(cUserId); if (Objects.isNull(cu)) { @@ -83,37 +87,37 @@ public class WxCouponSendController extends BaseController { } WxCouponSend wxCouponSend = new WxCouponSend(); - wxCouponSend.setIds(Arrays.asList(wxCouponSendIds)); + wxCouponSend.setIds(Arrays.stream(wxCouponSendIds).map(Long::parseLong).collect(Collectors.toList())); wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); - wxCouponSendService.handSel(wxCouponSend,cu); - + wxCouponSendService.handSel(wxCouponSend, cu); return new ResultData(); } @ApiOperation("注券记录") @GetMapping("/actionLog") @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "channelType", value = "开始日期 yyyy-MM-dd", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "beginDate", value = "开始日期 yyyy-MM-dd", dataType = "string", paramType = "query"), @ApiImplicitParam(name = "endDate", value = "结束日期 yyyy-MM-dd", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) - public ResultData sendLog(String beginDate, String endDate, Integer pageNum, Integer pageSize) { + public ResultData sendLog(Integer channelType, String beginDate, String endDate, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponSendController::actionLog"); - Date begin = DateUtils.stringToDate(beginDate) ; - Date end = DateUtils.stringToDate(endDate) ; + Date begin = DateUtils.stringToDate(beginDate); + Date end = DateUtils.stringToDate(endDate); Calendar cal = Calendar.getInstance(); cal.setTime(end); cal.add(Calendar.DATE, 1); - Map params = new HashMap<>() ; - params.put("tenantId",getTenantId()) ; - params.put("channelType",EnumCouponSendSendType.MERCHANT.getCode()) ; - params.put("merchantId",getUser().getMerchantId()) ; - params.put("beginDate",begin) ; - params.put("endDate",cal.getTime()) ; - PageInfo data = wxCouponActionLogService.getActionLog(params,pageNum,pageSize) ; + Map params = new HashMap<>(); + params.put("tenantId", getTenantId()); + params.put("channelType", channelType); + params.put("merchantId", getUser().getMerchantId()); + params.put("beginDate", begin); + params.put("endDate", cal.getTime()); + PageInfo data = wxCouponActionLogService.getActionLog(params, pageNum, pageSize); return new ResultData(data); }