协销订单设置机构名称

src/main/java/com/caimei365/order/mapper/BaseMapper.java

@@ -21,6 +21,11 @@ public interface BaseMapper {
      * @param shopId 供应商Id
      */
     String getShopNameById(Integer shopId);
+    /**
+     * 供应商名称
+     * @param clubId 供应商Id
+     */
+    String getClubNameById(Integer clubId);
     /**
      * 获取商品供应商Id
      * @param productId 商品Id

src/main/java/com/caimei365/order/model/vo/OrderVo.java

@@ -34,6 +34,10 @@ public class OrderVo implements Serializable {
      * 机构Id
      */
     private Integer clubId;
+    /**
+     * 机构名称（协销订单列表用）
+     */
+    private String clubName;
     /**
      * 下单人Id(协销Id,或运营人Id,或用户Id)
      */

src/main/java/com/caimei365/order/service/impl/OrderSellerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.caimei365.order.service.impl;
 
 import com.caimei365.order.components.OrderCommonService;
+import com.caimei365.order.mapper.BaseMapper;
 import com.caimei365.order.mapper.OrderSellerMapper;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.vo.OrderVo;
@@ -27,6 +28,8 @@ public class OrderSellerServiceImpl implements OrderSellerService {
     private OrderSellerMapper orderSellerMapper;
     @Resource
     private OrderCommonService orderCommonService;
+    @Resource
+    private BaseMapper baseMapper;
 
     /**
      * 协销订单列表
@@ -46,19 +49,27 @@ public class OrderSellerServiceImpl implements OrderSellerService {
         PageHelper.startPage(pageNum, pageSize);
         // 获取订单列表
         List<OrderVo> orderList = orderSellerMapper.getOrderList(clubUserIds, listType, orderSubmitType, orderNo);
-        //获取主订单数据
-        orderList.forEach(order -> {
-            // 设置订单状态
-            orderCommonService.setOrderStatus(order);
-            // 设置子订单数据
-            orderCommonService.getShopOrderData(order);
-            // 设置付款金额
-            orderCommonService.getDiscernReceiptAndSetOrder(order);
-        });
+        //设置主订单数据
+        orderList.forEach(this::setSellerOrder);
         PageInfo<OrderVo> pageInfo = new PageInfo(orderList);
         return ResponseJson.success(pageInfo);
     }
 
+    /**
+     * 设置协销订单
+     */
+    private void setSellerOrder(OrderVo order) {
+        // 设置订单状态
+        orderCommonService.setOrderStatus(order);
+        // 设置子订单数据
+        orderCommonService.getShopOrderData(order);
+        // 设置付款金额
+        orderCommonService.getDiscernReceiptAndSetOrder(order);
+        // 设置机构名称
+        String clubName = baseMapper.getClubNameById(order.getClubId());
+        order.setClubName(clubName);
+    }
+
     /**
      * 协销下机构总订单列表
      *
@@ -80,15 +91,8 @@ public class OrderSellerServiceImpl implements OrderSellerService {
         PageHelper.startPage(pageNum, pageSize);
         // 获取订单列表
         List<OrderVo> orderList = orderSellerMapper.getOrderListClub(clubId, listType, orderSubmitType);
-        //获取主订单数据
-        orderList.forEach(order -> {
-            // 设置订单状态
-            orderCommonService.setOrderStatus(order);
-            // 设置子订单数据
-            orderCommonService.getShopOrderData(order);
-            // 设置付款金额
-            orderCommonService.getDiscernReceiptAndSetOrder(order);
-        });
+        //设置主订单数据
+        orderList.forEach(this::setSellerOrder);
         PageInfo<OrderVo> pageInfo = new PageInfo(orderList);
         // 更新协销查看机构订单时间
         orderSellerMapper.updateClubLastCheckOrderDate(clubId, new Date());
@@ -118,15 +122,8 @@ public class OrderSellerServiceImpl implements OrderSellerService {
         PageHelper.startPage(pageNum, pageSize);
         // 获取订单列表
         List<OrderVo> orderList = orderSellerMapper.getOrderListByKeyword(clubUserIds, searchWord);
-        //获取主订单数据
-        orderList.forEach(order -> {
-            // 设置订单状态
-            orderCommonService.setOrderStatus(order);
-            // 设置子订单数据
-            orderCommonService.getShopOrderData(order);
-            // 设置付款金额
-            orderCommonService.getDiscernReceiptAndSetOrder(order);
-        });
+        //设置主订单数据
+        orderList.forEach(this::setSellerOrder);
         PageInfo<OrderVo> pageInfo = new PageInfo(orderList);
         return ResponseJson.success(pageInfo);
     }

src/main/resources/mapper/BaseMapper.xml

@@ -4,6 +4,9 @@
     <select id="getShopNameById" resultType="java.lang.String">
         SELECT `name` FROM shop WHERE shopID = #{shopId}
     </select>
+    <select id="getClubNameById" resultType="java.lang.String">
+        SELECT `name` FROM club WHERE clubID = #{clubId}
+    </select>
     <insert id="insertUserInvoiceByUserId" parameterType="com.caimei365.order.model.vo.InvoiceVo">
         INSERT INTO cm_user_invoiceinfo (userId, invoiceTitle, corporationTaxNum, registeredAddress, registeredPhone, bankAccountNo, openBank)
         VALUES(#{userId}, #{invoiceTitle}, #{corporationTaxNum},#{registeredAddress}, #{registeredPhone},#{bankAccountNo}, #{openBank})