|
@@ -135,11 +135,7 @@ public class ChannelOrderController extends BaseApiController {
|
|
|
@ApiOperation(value = "订单结算" , notes = "购物车里点结算或者单个盲票组商品上点立即购买")
|
|
|
public AjaxResult settle(@Valid @RequestBody ChannelOrderParam param) {
|
|
|
Long channelId = SecurityUtils.getLoginUser().getChannelId();
|
|
|
- Channel channel = channelService.getById(channelId);
|
|
|
- if (channel.getCertifyStatus() != ChannelCertifyStatusEnum.CERTIFIED) {
|
|
|
- LogUtil.info(logger, "账号未认证。channelId:{0}", channelId);
|
|
|
- return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1016);
|
|
|
- }
|
|
|
+
|
|
|
ChannelOrderSettleVO orderSettleVO = new ChannelOrderSettleVO();
|
|
|
|
|
|
// 收货地址,如果用户选了地址,则此处不做处理
|
|
@@ -187,6 +183,11 @@ public class ChannelOrderController extends BaseApiController {
|
|
|
@ApiOperation(value = "提交订单" , notes = "在订单确认页面提交")
|
|
|
public AjaxResult submit(@RequestBody ChannelOrder order) {
|
|
|
Long channelId = SecurityUtils.getLoginUser().getChannelId();
|
|
|
+ Channel channel = channelService.getById(channelId);
|
|
|
+ if (channel.getCertifyStatus() != ChannelCertifyStatusEnum.CERTIFIED) {
|
|
|
+ LogUtil.info(logger, "账号未认证。channelId:{0}", channelId);
|
|
|
+ return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1016);
|
|
|
+ }
|
|
|
ChannelOrderSettleVO orderSettleVO = redisCache.getCacheObject(CHANNEL_ORDER_CACHE_KEY + channelId);
|
|
|
if (null == orderSettleVO) {
|
|
|
return AjaxResult.error("订单已过期,请重新下单");
|