| @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController; | |||||
| import javax.annotation.Resource; | import javax.annotation.Resource; | ||||
| import java.util.*; | import java.util.*; | ||||
| import java.util.stream.Collectors; | |||||
| @RestController | @RestController | ||||
| @RequestMapping("/api/couponSend") | @RequestMapping("/api/couponSend") | ||||
| @@ -46,6 +47,7 @@ public class WxCouponSendController extends BaseController { | |||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @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), | ||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), | |||||
| }) | }) | ||||
| public ResultData list(WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { | public ResultData list(WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); | logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); | ||||
| @@ -54,9 +56,11 @@ public class WxCouponSendController extends BaseController { | |||||
| } | } | ||||
| wxCouponSend.setTenantId(getTenantId()); | wxCouponSend.setTenantId(getTenantId()); | ||||
| wxCouponSend.setMerchantId(getUser().getMerchantId()); | 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 | //库存大于0 | ||||
| wxCouponSend.setMerchantLnventory(0); | |||||
| wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| final PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); | final PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); | ||||
| @@ -69,10 +73,10 @@ public class WxCouponSendController extends BaseController { | |||||
| @ApiOperation("商户注券") | @ApiOperation("商户注券") | ||||
| @GetMapping("/handSel") | @GetMapping("/handSel") | ||||
| @ApiImplicitParams({ | @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), | @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"); | logger.debug("[" + getIpAddr() + "] WxCouponSendController::handSel"); | ||||
| WxCUser cu = wxCUserMapper.selectByPrimaryKey(cUserId); | WxCUser cu = wxCUserMapper.selectByPrimaryKey(cUserId); | ||||
| if (Objects.isNull(cu)) { | if (Objects.isNull(cu)) { | ||||
| @@ -83,37 +87,37 @@ public class WxCouponSendController extends BaseController { | |||||
| } | } | ||||
| WxCouponSend wxCouponSend = new WxCouponSend(); | WxCouponSend wxCouponSend = new WxCouponSend(); | ||||
| wxCouponSend.setIds(Arrays.asList(wxCouponSendIds)); | |||||
| wxCouponSend.setIds(Arrays.stream(wxCouponSendIds).map(Long::parseLong).collect(Collectors.toList())); | |||||
| wxCouponSend.setTenantId(getTenantId()); | wxCouponSend.setTenantId(getTenantId()); | ||||
| wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); | wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); | ||||
| wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | ||||
| wxCouponSendService.handSel(wxCouponSend,cu); | |||||
| wxCouponSendService.handSel(wxCouponSend, cu); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @ApiOperation("注券记录") | @ApiOperation("注券记录") | ||||
| @GetMapping("/actionLog") | @GetMapping("/actionLog") | ||||
| @ApiImplicitParams({ | @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 = "beginDate", value = "开始日期 yyyy-MM-dd", dataType = "string", paramType = "query"), | ||||
| @ApiImplicitParam(name = "endDate", 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"); | 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(); | Calendar cal = Calendar.getInstance(); | ||||
| cal.setTime(end); | cal.setTime(end); | ||||
| cal.add(Calendar.DATE, 1); | cal.add(Calendar.DATE, 1); | ||||
| Map<String,Object> 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<WxCouponActionLogVo> data = wxCouponActionLogService.getActionLog(params,pageNum,pageSize) ; | |||||
| Map<String, Object> 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<WxCouponActionLogVo> data = wxCouponActionLogService.getActionLog(params, pageNum, pageSize); | |||||
| return new ResultData(data); | return new ResultData(data); | ||||
| } | } | ||||