Преглед изворни кода

aaaaa

release_toaliyun_real
xhxu пре 5 година
родитељ
комит
2922655470
1 измењених фајлова са 2 додато и 9 уклоњено
  1. +2
    -9
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java

+ 2
- 9
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java Прегледај датотеку

@@ -170,7 +170,7 @@ public class WxOrderController extends BaseController {
} }


try { try {
WxCUser user = wxCUserService.getById(orderSaveDto.getUserId());
WxCUserBasicInfo user = wxCUserBasicInfoService.getById(orderSaveDto.getUserId());
if(null == user) { if(null == user) {
logger.error("wxcuser未找到:"+orderSaveDto.getUserId()); logger.error("wxcuser未找到:"+orderSaveDto.getUserId());
return new ResultData(ErrorCode.COUPON_IS_EMPTY); return new ResultData(ErrorCode.COUPON_IS_EMPTY);
@@ -186,15 +186,8 @@ public class WxOrderController extends BaseController {
if (!wxOrderService.checkCouponIsFree(coupon)) { if (!wxOrderService.checkCouponIsFree(coupon)) {
return new ResultData(ErrorCode.COUPON_IS_NOT_FREE); return new ResultData(ErrorCode.COUPON_IS_NOT_FREE);
} }
if(!user.isBasicInfo()) {
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER);
}
WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.getById(orderSaveDto.getUserId());
if (null == basicInfo) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"会员用户未找到. "+orderSaveDto.getUserId());
}
// 免费券 // 免费券
order = wxOrderService.saveFreeOrderForCoupon(basicInfo, coupon, orderSaveDto.getCouponChannelId(), orderSaveDto.getFormId(), null);
order = wxOrderService.saveFreeOrderForCoupon(user, coupon, orderSaveDto.getCouponChannelId(), orderSaveDto.getFormId(), null);
return new ResultData(order); return new ResultData(order);
} catch (MallinkException e) { } catch (MallinkException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());


Loading…
Откажи
Сачувај