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

+ 1 - 1
src/main/java/com/dk/oauth/entity/Trade.java

@@ -133,7 +133,7 @@ public class Trade  extends PageInfo<Trade> implements Serializable {
      */
     @Excel(name = "微信交易单号")
     @ApiModelProperty(value = "微信交易单号")
-    private String wxGradeNo;
+    private String wxTradeNo;
 
 
     /**

+ 1 - 1
src/main/java/com/dk/oauth/entity/TradeResponse.java

@@ -113,7 +113,7 @@ public class TradeResponse   {
      * 微信交易单号
      */
     @ApiModelProperty(value = "微信交易单号")
-    private String wxGradeNo;
+    private String wxTradeNo;
 
 
     /**

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

@@ -138,7 +138,7 @@ public class WechatPayService {
         // 更新交易记录状态
         Trade trade = new Trade();
         trade.setTradeId(tradeList.get(0).getTradeId());
-        trade.setWxGradeNo(info.getTransactionId());
+        trade.setWxTradeNo(info.getTransactionId());
         trade.setTradeStatus(Constant.TradeStatus.EFFECTIVE.getName());
         tradeMapper.updateById(trade);
 

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

@@ -36,7 +36,7 @@
         <result column="buy_end_date" property="buyEndDate" typeHandler="TimestampTypeHandler"/>
         <result column="buy_fun_id" property="buyFunId" typeHandler="UuidListTypeHandler"/>
         <result column="buy_grade_code" property="buyGradeCode"/>
-        <result column="wx_trade_no" property="wxGradeNo"/>
+        <result column="wx_trade_no" property="wxTradeNo"/>
         <result column="extend_days" property="extendDays"/>
         <result column="dk_user_id" property="dkUserId" typeHandler="UuidTypeHandler"/>
     </resultMap>
@@ -55,7 +55,7 @@
         <result column="buy_end_date" property="buyEndDate" typeHandler="TimestampTypeHandler"/>
         <result column="buy_fun_id" property="buyFunId" typeHandler="UuidListTypeHandler"/>
         <result column="buy_grade_code" property="buyGradeCode"/>
-        <result column="wx_trade_no" property="wxGradeNo"/>
+        <result column="wx_trade_no" property="wxtradeNo"/>
         <result column="extend_days" property="extendDays"/>
         <result column="dk_user_id" property="dkUserId" typeHandler="UuidTypeHandler"/>
     </resultMap>
@@ -154,7 +154,7 @@
                 #{item.buyEndDate},
                 #{item.buyFunId}::uuid[],
                 #{item.buyGradeCode},
-                #{item.wxGradeNo},
+                #{item.wxTradeNo},
                 #{item.extendDays},
                 #{item.dkUserId}::uuid,
             </trim>