|
|
@@ -130,14 +130,14 @@ public class WechatPayService {
|
|
|
UserLogin byWxid = userMapper.getByWxid(info.getOpenid());
|
|
|
log.info("微信用户----------" + byWxid);
|
|
|
// 获取交易记录
|
|
|
- List<TradeResponse> tradeList = tradeMapper.selectTrade(new Trade().setTradeNo(info.getOutTradeNo()));
|
|
|
- if(tradeList == null || tradeList.size() == 0){
|
|
|
+ TradeResponse tradeResponse = tradeMapper.selectTradeByNo(new Trade().setTradeNo(info.getOutTradeNo()));
|
|
|
+ if(tradeResponse == null){
|
|
|
throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(),
|
|
|
ErrorCodeEnum.NO_FIND_TRADE.getMessage());
|
|
|
}
|
|
|
// 更新交易记录状态
|
|
|
Trade trade = new Trade();
|
|
|
- trade.setTradeId(tradeList.get(0).getTradeId());
|
|
|
+ trade.setTradeId(tradeResponse.getTradeId());
|
|
|
trade.setWxTradeNo(info.getTransactionId());
|
|
|
trade.setTradeStatus(Constant.TradeStatus.EFFECTIVE.getName());
|
|
|
tradeMapper.updateById(trade);
|
|
|
@@ -146,7 +146,7 @@ public class WechatPayService {
|
|
|
log.info("交易记录----------" + trade);
|
|
|
// 企业
|
|
|
Company comp = new Company();
|
|
|
- comp.setCpId(tradeList.get(0).getCpId());
|
|
|
+ comp.setCpId(tradeResponse.getCpId());
|
|
|
companyMapper.updateCompanyLicense(comp);
|
|
|
log.info("交易记录-企业更新----------" + comp);
|
|
|
return ResponseResultUtil.success();
|