| @@ -208,9 +208,10 @@ public class WxCouponOrderController extends BaseController { | |||||
| @ApiOperation(value = "手动核销方式,获取动态id") | @ApiOperation(value = "手动核销方式,获取动态id") | ||||
| @GetMapping("dynamicId") | @GetMapping("dynamicId") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) | |||||
| @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "couponTenantId", value = "券tenantID", dataType = "string", paramType = "query", required = false) | |||||
| }) | }) | ||||
| public ResultData dynamicId(String couponOrderId) { | |||||
| public ResultData dynamicId(String couponOrderId,String couponTenantId) { | |||||
| if (StringUtils.isBlank(couponOrderId) || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED)) { | if (StringUtils.isBlank(couponOrderId) || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED)) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| @@ -224,6 +225,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| Map retmap = new HashMap(); | Map retmap = new HashMap(); | ||||
| retmap.put("dynamicId", WxCouponOrderCVo.calcuteExpiredCouponOrderId(couponOrderId,Integer.parseInt(sysConfig.getConfigItemValue()))); | retmap.put("dynamicId", WxCouponOrderCVo.calcuteExpiredCouponOrderId(couponOrderId,Integer.parseInt(sysConfig.getConfigItemValue()))); | ||||
| retmap.put("expiredSeconds", Integer.parseInt(sysConfig.getConfigItemValue())); | retmap.put("expiredSeconds", Integer.parseInt(sysConfig.getConfigItemValue())); | ||||
| retmap.put("couponTenantId", couponTenantId); | |||||
| return new ResultData(retmap); | return new ResultData(retmap); | ||||
| } | } | ||||