|
@@ -57,11 +57,6 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private WxMerchantMapper wxMerchantMapper; |
|
|
private WxMerchantMapper wxMerchantMapper; |
|
|
|
|
|
|
|
|
// @Autowired |
|
|
|
|
|
// private WxCUserBasicInfoService wxCUserBasicInfoService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private TtCUserService ttCUserService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
private WxAppinfoService wxAppinfoService; |
|
|
private WxAppinfoService wxAppinfoService; |
|
@@ -91,12 +86,6 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
logger.info("OrderSave: couponId:" + couponId + "---cUserId:"+cUserId); |
|
|
logger.info("OrderSave: couponId:" + couponId + "---cUserId:"+cUserId); |
|
|
TtCUser byId = ttCUserService.getById(cUserId, tenantEntity.getTenantId()); |
|
|
|
|
|
// WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUserId,tenantEntity.getFinalTenantId()); |
|
|
|
|
|
// if(wxCUserBasicInfo == null){ |
|
|
|
|
|
if(byId == null){ |
|
|
|
|
|
return new ResultData(ErrorCode.USER_IS_EMPTY); |
|
|
|
|
|
} |
|
|
|
|
|
TtOrder orderQ = new TtOrder(); |
|
|
TtOrder orderQ = new TtOrder(); |
|
|
orderQ.setCUserId(cUserId); |
|
|
orderQ.setCUserId(cUserId); |
|
|
orderQ.setProductId(couponId); |
|
|
orderQ.setProductId(couponId); |
|
@@ -211,13 +200,6 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
if(!order.getCUserId().equals(memberId)){ |
|
|
if(!order.getCUserId().equals(memberId)){ |
|
|
return new ResultData(ErrorCode.ORDER_USER_NOT_MATCH); |
|
|
return new ResultData(ErrorCode.ORDER_USER_NOT_MATCH); |
|
|
} |
|
|
} |
|
|
TtCUser byId = ttCUserService.getById(memberId, tenantEntity.getTenantId()); |
|
|
|
|
|
// WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(memberId,tenantEntity.getFinalTenantId()); |
|
|
|
|
|
// if ( null == wxCUserBasicInfo) { |
|
|
|
|
|
if ( byId == null) { |
|
|
|
|
|
logger.error("用户不存在."+memberId); |
|
|
|
|
|
return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"用户不存在."+memberId); |
|
|
|
|
|
} |
|
|
|
|
|
// if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { |
|
|
// if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { |
|
|
// return new ResultData(ErrorCode.MEMBER_IS_LOCKED); |
|
|
// return new ResultData(ErrorCode.MEMBER_IS_LOCKED); |
|
|
// } |
|
|
// } |
|
|