Przeglądaj źródła

管理端订单中心新增transactionId字段,用于根据渠道交易号查询订单数据

codingliang 1 rok temu
rodzic
commit
d9315130f1

+ 2 - 0
src/main/java/com/sqx/modules/order/dto/OrderQueryDto.java

@@ -41,4 +41,6 @@ public class OrderQueryDto extends PageQuery {
     private Integer riderStationId;
     @ApiModelProperty("商铺类型id")
     private String shopTypeId;
+    @ApiModelProperty("第三方支付系统交易号")
+    private String transactionId;
 }

+ 6 - 1
src/main/resources/mapper/order/OrderMapper.xml

@@ -93,7 +93,8 @@
         ti.rider_user_id as riderUserId, tcu.money as couponMoney,
         apr.discount_amount as activityDiscountAmount, ai.title activityTitle,tiu.rider_station_id as riderStationId,
         (select rs.station_name from rider_station rs where  rs.id =tiu.rider_station_id ) as stationName,
-        (select st.shop_type_name from shop_type st where  st.id =gs.shop_type_id ) as shopTypeName
+        (select st.shop_type_name from shop_type st where  st.id =gs.shop_type_id ) as shopTypeName,
+        pd.trade_no as transactionId
         from tb_order tor
         left join tb_user tu on tor.user_id = tu.user_id
         left join goods_shop gs on tor.shop_id = gs.shop_id
@@ -102,6 +103,7 @@
         left join tb_coupon_user tcu on tor.coupon_id = tcu.id
         left join activity_part_record apr on apr.order_id = tor.order_id
         left join activity ai on ai.id = apr.activity_id
+        left join pay_details pd on pd.order_id = tor.order_number
         where 1 = 1
         <if test="query.riderPhone!=null and query.riderPhone!=''">
             and tiu.phone =#{query.riderPhone}
@@ -154,6 +156,9 @@
         <if test="query.shopTypeId!=null and query.shopTypeId!=''">
             and gs.shop_type_id=#{query.shopTypeId}
         </if>
+        <if test="query.transactionId != null and query.transactionId != ''">
+            and pd.trade_no = #{query.transactionId}
+        </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>