|
|
|
@@ -91,15 +91,13 @@ public class WxOrderController extends BaseController { |
|
|
|
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); |
|
|
|
String couponChannelIdStr = paramMap.get("couponChannelId"); |
|
|
|
String couponIdStr = paramMap.get("couponId"); |
|
|
|
/* |
|
|
|
// TODO 修改支持banner图,获取不到couponChannelId问题 |
|
|
|
|
|
|
|
if (StringUtils.isBlank(couponChannelIdStr)) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId不能为空"); |
|
|
|
} |
|
|
|
*/ |
|
|
|
Long couponChannelId = 0L, couponId = 0L; |
|
|
|
|
|
|
|
if (!StringUtils.isBlank(couponChannelIdStr)) { |
|
|
|
if (StringUtils.isNotBlank(couponChannelIdStr)) { |
|
|
|
try { |
|
|
|
couponChannelId = Long.valueOf(couponChannelIdStr); |
|
|
|
} catch (NumberFormatException e) { |
|
|
|
@@ -136,7 +134,7 @@ public class WxOrderController extends BaseController { |
|
|
|
WxCUser user = getUser(); |
|
|
|
|
|
|
|
try { |
|
|
|
WxOrder order = wxOrderService.saveOrder(user, couponId); |
|
|
|
WxOrder order = wxOrderService.saveOrder(user, couponChannelId, couponId); |
|
|
|
return new ResultData(order); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
|