zhoux 1 год назад
Родитель
Сommit
210ef3db48

+ 3 - 1
src/main/java/com/dk/oauth/mapper/TradeMapper.java

@@ -4,6 +4,7 @@ import com.dk.common.mapper.BaseMapper;
 import com.dk.oauth.entity.Trade;
 import com.dk.oauth.entity.Trade;
 import com.dk.oauth.entity.TradeResponse;
 import com.dk.oauth.entity.TradeResponse;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -12,11 +13,12 @@ import java.util.List;
  * @desc : CompanyMapper
  * @desc : CompanyMapper
  * @date : 2024-2-18 15:39
  * @date : 2024-2-18 15:39
  */
  */
+@Repository
 public interface TradeMapper extends BaseMapper<Trade> {
 public interface TradeMapper extends BaseMapper<Trade> {
 
 
     int insertBatch(@Param("list") List<Trade> list);
     int insertBatch(@Param("list") List<Trade> list);
 
 
-    List<Trade> selectByCond(Trade t);
+    List<TradeResponse> selectTrade(Trade t);
 
 
     Long countByCond(Trade t);
     Long countByCond(Trade t);
 
 

+ 2 - 1
src/main/java/com/dk/oauth/service/wxapi/basic/WechatPayService.java

@@ -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());

+ 1 - 1
src/main/resources/mapper/TradeMapper.xml

@@ -96,7 +96,7 @@
     </select>
     </select>
 
 
     <!-- 查询表t_cp_trade,(条件查询+分页)列表 -->
     <!-- 查询表t_cp_trade,(条件查询+分页)列表 -->
-    <select id="selectByCond" resultMap="BaseResultMap">
+    <select id="selectTrade" resultMap="BaseResultMap">
         SELECT
         SELECT
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
         ,g.grade_name gradeName
         ,g.grade_name gradeName