pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/mapper/OrderMapper.java

@@ -18,7 +18,7 @@ public interface OrderMapper extends BaseMapper<Order> {
 
     List<OrdersVO> selectOrdersByOrderNum(@Param("orderNum") String orderNum);
 
-    List<OrdersVO> selectOrdersByThirdOrderNo(@Param("thirdOrderNo") String thirdOrderNo);
+    List<OrdersVO> getOrderListByThirdTradeNo(@Param("thirdOrderNo") String thirdTradeNo);
 
     List<OrdersVO> getOrderByUser(@Param("userId") String userId, @Param("platform") Integer platform);
 

pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/OrderServiceImpl.java

@@ -825,7 +825,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     public List<OrdersVO> getOrderListByThirdTradeNo(String thirdTradeNo) {
-        return this.baseMapper.selectOrdersByThirdOrderNo(thirdTradeNo);
+        return this.baseMapper.getOrderListByThirdTradeNo(thirdTradeNo);
     }
 
     @Override

pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/PayCenterWebhookServiceImpl.java

@@ -422,7 +422,7 @@ public class PayCenterWebhookServiceImpl implements PayCenterWebhookService {
                     BeanUtil.copyProperties(ordersVOList.get(0), cycleOrder);
                     cycleOrder.setId(CommonUtils.generateId());
                     cycleOrder.setTradeNo(cn.kdan.cloud.pdf.office.payment.utils.CommonUtils.generateRightsId((long) ((Math.random() * 9999 + 1) * 10000)));
-                    cycleOrder.setThirdTradeNo(payId);
+                    cycleOrder.setThirdOrderNo(payId);
                     ordersService.save(cycleOrder);
                     // 通过thirdTradeId更新subscription
                     Subscription serviceOne = subscriptionsService.getOne(new LambdaQueryWrapper<Subscription>().eq(Subscription::getThirdSubscriptionId, thirdTradeId));

pdf-office-payment/src/main/resources/mapper/OrderMapper.xml

@@ -80,7 +80,7 @@
         where trade_no = #{orderNum}
     </select>
 
-    <select id="selectOrdersByThirdOrderNo" resultType="cn.kdan.cloud.pdf.office.api.payment.vo.OrdersVO">
+    <select id="getOrderListByThirdTradeNo" resultType="cn.kdan.cloud.pdf.office.api.payment.vo.OrdersVO">
         select id,app_id,subscription_id,trade_no,third_order_no
              ,price
              ,payment
@@ -100,7 +100,7 @@
              ,user_id
              ,email,pay_number,discount_type,subscription_type,payment_model
         from `order`
-        where third_trade_no = #{thirdOrderNo}
+        where third_trade_no = #{thirdTradeNo}
     </select>
 
     <select id="getOrderByUser" resultType="cn.kdan.cloud.pdf.office.api.payment.vo.OrdersVO">