diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index b4521ed1f..aa289dac2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -170,7 +170,7 @@ public class WxOrderController extends BaseController { } try { - WxCUser user = wxCUserService.getById(orderSaveDto.getUserId()); + WxCUserBasicInfo user = wxCUserBasicInfoService.getById(orderSaveDto.getUserId()); if(null == user) { logger.error("wxcuser未找到:"+orderSaveDto.getUserId()); return new ResultData(ErrorCode.COUPON_IS_EMPTY); @@ -186,15 +186,8 @@ public class WxOrderController extends BaseController { if (!wxOrderService.checkCouponIsFree(coupon)) { 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); } catch (MallinkException e) { logger.error(e.getMessage());