订单信息返回

src/main/java/org/springblade/modules/finance/mapper/OrderGoodsMapper.xml

@@ -98,14 +98,12 @@
 
     <select id="getMerchantOrder" resultType="org.springblade.modules.finance.vo.MerchantPageOrderVO">
         SELECT
-            og.*,
-            o.image,
-            o.order_state,
-            o.is_aftersales
+            o.*
         FROM
             t_order o
                 JOIN t_order_goods og ON o.id = og.order_id
-        WHERE o.is_delete = 0 and o.user_id = #{param.userId}
+        WHERE o.is_delete = 0
+          and og.merchant_id = #{param.userId}
     </select>
 
     <select id="getMerchantOrderNum" resultType="java.lang.String">
@@ -114,7 +112,8 @@
         FROM
             t_order o
                 JOIN t_order_goods og ON o.id = og.order_id
-        WHERE o.is_delete = 0 and o.user_id = #{merchantId}
+        WHERE o.is_delete = 0
+          and og.merchant_id = #{merchantId}
     </select>
 
 </mapper>

src/main/java/org/springblade/modules/finance/service/impl/OrderGoodsServiceImpl.java

@@ -103,6 +103,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
 		order.setPaymentAmount(order.getTotalAmount().subtract(order.getDiscountAmount()));
 		order.setConsignee(user.getName());
 		order.setConsigneePhoneNumber(user.getPhone());
+		order.setImage(goods.getGoodsCover());
 		iOrderService.save(order);
 
 		OrderGoods orderGoods = new OrderGoods();