update:商城导出订单 添加商品明细

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -358,6 +358,10 @@ public class FsStoreOrderScrmController extends BaseController {
                 if (vo.getUserAddress()!=null && sysRole.getIsCheckAddress() != 1){
                     vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
                 }
+                //商品明细
+                String orderItem = orderItemService.selectFsStoreOrderItemByOrderId(vo.getId());
+                vo.setOrderItem(orderItem);
+
             }
         }
         String filter = param.getFilter();

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderItemScrmMapper.java

@@ -284,4 +284,6 @@ public interface FsStoreOrderItemScrmMapper
 
 
     List<FsStoreOrderItemVO> selectFsStoreOrderItemListByOrderIds(@Param("orderIds")List<Long> orderIds);
+
+    String selectFsStoreOrderItemByOrderId(@Param("orderId") Long orderId);
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreOrderItemScrmService.java

@@ -75,4 +75,6 @@ public interface IFsStoreOrderItemScrmService
     int updateFsStoreOrderCode(Long orderId, String orderCode);
 
     List<FsStoreOrderItemListDVO> selectFsStoreOrderItemListDVOByOrderId(Long orderId);
+
+    String selectFsStoreOrderItemByOrderId(Long orderId);
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderItemScrmServiceImpl.java

@@ -126,4 +126,14 @@ public class FsStoreOrderItemScrmServiceImpl implements IFsStoreOrderItemScrmSer
     public List<FsStoreOrderItemListDVO> selectFsStoreOrderItemListDVOByOrderId(Long orderId) {
         return fsStoreOrderItemMapper.selectFsStoreOrderItemListDVOByOrderId(orderId);
     }
+
+    /**
+     * 根据订单id查询订单详情汇总
+     * @param orderId
+     * @return
+     */
+    @Override
+    public String selectFsStoreOrderItemByOrderId(Long orderId) {
+        return fsStoreOrderItemMapper.selectFsStoreOrderItemByOrderId(orderId);
+    }
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderErpExportVO.java

@@ -21,4 +21,6 @@ public class FsStoreOrderErpExportVO extends FsStoreOrderExportVO
     private String erpPhone;
     @Excel(name = "ERP账户",sort = 2)
     private String erpAccount;
+    @Excel(name = "商品明细")
+    private String orderItem;
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderExportVO.java

@@ -119,7 +119,7 @@ public class FsStoreOrderExportVO implements Serializable
     private Date payTime;
 
     /** 支付方式 */
-    @Excel(name = "支付方式")
+    @Excel(name = "支付方式",dictType = "store_pay_type")
     private String payType;
 
     /** 订单状态（-1 : 申请退款 -2 : 退货成功 0：待发货；1：待收货；2：已收货；3：已完成；-1：已退款） */

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderItemScrmMapper.xml

@@ -110,5 +110,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{itemId}
         </foreach>
     </select>
+    <select id="selectFsStoreOrderItemByOrderId" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(
+            CONCAT(
+                JSON_UNQUOTE(JSON_EXTRACT(json_info, '$.productName')),
+                '*',
+                num
+            )
+            ORDER BY item_id
+            SEPARATOR 0x0A
+        ) AS order_items
+        FROM fs_store_order_item_scrm
+        WHERE order_id = #{orderId}
+        GROUP BY order_id;
+    </select>
 
 </mapper>