|
|
|
@@ -204,7 +204,7 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData createPay(TenantEntity tenantEntity,Long orderId, Long memberId, WxAppinfo appInfo) { |
|
|
|
public ResultData createPay(TenantEntity tenantEntity,Long orderId, Long memberId) { |
|
|
|
TtOrder order = ttOrderMapper.selectById(orderId); |
|
|
|
if (null == order) { |
|
|
|
logger.error("pay order, order not allow, orderId: " + orderId); |
|
|
|
@@ -213,7 +213,7 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
if(!order.getCUserId().equals(memberId)){ |
|
|
|
return new ResultData(ErrorCode.ORDER_USER_NOT_MATCH); |
|
|
|
} |
|
|
|
TtCUser byId = ttCUserService.getById(memberId, tenantEntity.getTenantId()); |
|
|
|
TtCUser byId = ttCUserService.getById(memberId, order.getTenantId()); |
|
|
|
// WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(memberId,tenantEntity.getFinalTenantId()); |
|
|
|
// if ( null == wxCUserBasicInfo) { |
|
|
|
if ( byId == null) { |
|
|
|
@@ -224,7 +224,7 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
// return new ResultData(ErrorCode.MEMBER_IS_LOCKED); |
|
|
|
// } |
|
|
|
|
|
|
|
// WxAppinfo appInfo = wxAppinfoService.getByAppId(appId); |
|
|
|
WxAppinfo appInfo = wxAppinfoService.getCAppInfo(order, EnumPayWay.PAY_WAY_TT); |
|
|
|
if(appInfo == null) { |
|
|
|
return new ResultData(ErrorCode.APP_ID_NOT_FOUND); |
|
|
|
} |
|
|
|
|