|
@@ -10,6 +10,7 @@ import com.dk.common.util.*;
|
|
|
import com.dk.oauth.config.WechatPayConfigInfo;
|
|
import com.dk.oauth.config.WechatPayConfigInfo;
|
|
|
import com.dk.oauth.entity.Company;
|
|
import com.dk.oauth.entity.Company;
|
|
|
import com.dk.oauth.entity.Trade;
|
|
import com.dk.oauth.entity.Trade;
|
|
|
|
|
+import com.dk.oauth.entity.TradeResponse;
|
|
|
import com.dk.oauth.entity.UserLogin;
|
|
import com.dk.oauth.entity.UserLogin;
|
|
|
import com.dk.oauth.mapper.CompanyMapper;
|
|
import com.dk.oauth.mapper.CompanyMapper;
|
|
|
import com.dk.oauth.mapper.TradeMapper;
|
|
import com.dk.oauth.mapper.TradeMapper;
|
|
@@ -129,7 +130,7 @@ public class WechatPayService {
|
|
|
UserLogin byWxid = userMapper.getByWxid(info.getOpenid());
|
|
UserLogin byWxid = userMapper.getByWxid(info.getOpenid());
|
|
|
log.info("微信用户----------" + byWxid);
|
|
log.info("微信用户----------" + byWxid);
|
|
|
// 获取交易记录
|
|
// 获取交易记录
|
|
|
- List<Trade> tradeList = tradeMapper.selectByCond(new Trade().setTradeNo(info.getOutTradeNo()));
|
|
|
|
|
|
|
+ List<TradeResponse> tradeList = tradeMapper.selectTrade(new Trade().setTradeNo(info.getOutTradeNo()));
|
|
|
if(tradeList == null || tradeList.size() == 0){
|
|
if(tradeList == null || tradeList.size() == 0){
|
|
|
throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(),
|
|
throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(),
|
|
|
ErrorCodeEnum.NO_FIND_TRADE.getMessage());
|
|
ErrorCodeEnum.NO_FIND_TRADE.getMessage());
|