Browse Source

售后列表补充订单编号

LuoDLeo 7 months ago
parent
commit
0baccb4c19

+ 5 - 5
src/main/java/org/springblade/modules/finance/mapper/AfterSalesMapper.xml

@@ -66,11 +66,11 @@
     </select>
 
     <select id="selectMerchantAfterSalesList" resultType="org.springblade.modules.finance.vo.AfterSalesVO">
-        SELECT
-            s.*
-        FROM
-            t_after_sales s
-                left join t_order_goods og on og.order_id = s.order_id
+        SELECT s.*,
+               o.order_no
+        FROM t_after_sales s
+            left join t_order_goods og on og.order_id = s.order_id
+            left join t_order o on s.order_id = o.id
         WHERE og.merchant_id = #{userId}
         <if test="state != null">
             <if test="state == 1">

+ 1 - 0
src/main/java/org/springblade/modules/finance/service/impl/AfterSalesServiceImpl.java

@@ -465,6 +465,7 @@ public class AfterSalesServiceImpl extends ServiceImpl<AfterSalesMapper, AfterSa
 		}
 		Order order = orderService.getById(afterSales.getOrderId());
 		vo.setOrder(OrderWrapper.build().entityVO(order));
+		vo.setOrderNo(order.getOrderNo());
 
 		if (YesOrNoEnum.YES.getValue().equals(vo.getRefundState())) {
 			OrderRefund refund = orderRefundService.lambdaQuery().eq(OrderRefund::getAfterSalesId, vo.getId()).one();