协销购物车bugfix

src/main/java/com/caimei365/order/OrderApplication.java

@@ -3,9 +3,7 @@ package com.caimei365.order;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * `@EnableEurekaClient`: 声明一个Eureka客户端，只能注册到Eureka Server
@@ -16,16 +14,17 @@ import org.springframework.web.reactive.function.client.WebClient;
  */
 @EnableDiscoveryClient
 @SpringBootApplication
+@EnableFeignClients
 public class OrderApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(OrderApplication.class, args);
     }
 
-    @Bean
-    @LoadBalanced
-    public WebClient.Builder webClientBuilder(){
-        return WebClient.builder();
-    }
+//    @Bean
+//    @LoadBalanced
+//    public WebClient.Builder webClientBuilder(){
+//        return WebClient.builder();
+//    }
 
 }

src/main/java/com/caimei365/order/components/OrderCommonService.java

@@ -58,6 +58,9 @@ public class OrderCommonService {
      */
     public void getShopOrderData(OrderVo order) {
         // 子订单
+        if (StringUtils.isEmpty(order.getShopOrderIds())){
+            return;
+        }
         String[] shopOrderIdArr = order.getShopOrderIds().split(",");
         List<String> shopOrderIds = Arrays.asList(shopOrderIdArr);
         List<ShopOrderVo> shopOrderList = orderCommonMapper.getShopOrderList(shopOrderIds);

src/main/java/com/caimei365/order/model/dto/SubmitDto.java

@@ -66,7 +66,6 @@ public class SubmitDto implements Serializable {
     /**
      * 订单金额数据：{
      *         "orderShouldPayFee": 609.11,
-     *         
      *         "balancePayFlag": 0,   余额支付标识，0不使用，1使用
      *         "clauseId": "2",
      *         "postage": "15",

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

@@ -98,6 +98,10 @@ public class CartItemVo implements Serializable {
      * 商品上架状态：0逻辑删除 1待审核 2已上架 3已下架 8审核未通过 9已冻结
      */
     private Integer validFlag;
+    /**
+     * 商品的类别：1正常商品(默认)，2二手商品
+     */
+    private Integer productCategory;
     /**
      * 商品促销活动
      */

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

@@ -681,7 +681,9 @@ public class CartSellerServiceImpl implements CartSellerService {
         Integer userBeans = baseMapper.getUserBeans(clubUserId);
         // 包装返回数据
         Map<String, Object> resultData = new HashMap<>();
-        resultData.put("shop", shop);
+        List<CartShopVo> shopList = new ArrayList<>();
+        shopList.add(shop);
+        resultData.put("list", shopList);
         resultData.put("kindCount", 1);
         resultData.put("totalCount", productCount);
         resultData.put("totalPrice", totalPrice);

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

@@ -1453,7 +1453,7 @@ public class SubmitServiceImpl implements SubmitService {
          * 构造返回参数
          */
         Map<String, Object> info = new HashMap<>();
-        info.put("orderID", String.valueOf(mainOrder.getOrderId()));
+        info.put("orderId", String.valueOf(mainOrder.getOrderId()));
         info.put("orderNo", String.valueOf(mainOrder.getOrderNo()));
         info.put("orderMark", "#" + mainOrder.getOrderId() + "#");
         //应付订单金额

src/main/resources/mapper/CartClubMapper.xml

@@ -48,6 +48,7 @@
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,
             p.taxPoint AS taxRate,
+            p.productCategory,
             p.validFlag AS validFlag
         FROM cm_cart c
         LEFT JOIN product p ON c.productID = p.productID
@@ -74,6 +75,7 @@
         p.includedTax AS includedTax,
         p.invoiceType AS invoiceType,
         p.taxPoint AS taxRate,
+        p.productCategory,
         p.validFlag AS validFlag
         FROM cm_cart c
         LEFT JOIN product p ON c.productID = p.productID
@@ -104,6 +106,7 @@
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,
             p.taxPoint AS taxRate,
+            p.productCategory,
             p.validFlag AS validFlag
         FROM cm_cart c
         LEFT JOIN product p ON c.productID = p.productID

src/main/resources/mapper/CartSellerMapper.xml

@@ -32,6 +32,7 @@
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,
             p.taxPoint AS taxRate,
+            p.productCategory,
             p.validFlag AS validFlag
         FROM bp_order_product_cart c
         LEFT JOIN product p ON c.productId = p.productID
@@ -125,6 +126,7 @@
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,
             p.taxPoint AS taxRate,
+            p.productCategory,
             p.validFlag AS validFlag
         FROM bp_order_product_cart c
         LEFT JOIN product p ON c.productId = p.productID
@@ -150,6 +152,7 @@
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,
             p.taxPoint AS taxRate,
+            p.productCategory,
             p.validFlag AS validFlag
         FROM product p
         LEFT JOIN cm_second_hand_detail cshd ON p.productID = cshd.productID

src/main/resources/mapper/OrderCommonMapper.xml

@@ -243,11 +243,11 @@
     <select id="getOrderByOrderId" resultType="com.caimei365.order.model.vo.OrderVo">
         SELECT
         orderID AS orderId,
+        shopOrderIds,
         orderSource,
         orderNo,
         userID AS userId,
         clubID AS clubId,
-        shopOrderIds,
         buyUserID AS buyUserId,
         orderTime AS orderTime,
         updateDate AS updateDate,

src/main/resources/mapper/OrderSellerMapper.xml

@@ -10,9 +10,9 @@
     <select id="getOrderList" resultType="com.caimei365.order.model.vo.OrderVo">
         SELECT
         orderID AS orderId,
+        shopOrderIds,
         orderSource,
         orderNo,
-        shopOrderIds,
         userID AS userId,
         clubID AS clubId,
         buyUserID AS buyUserId,
@@ -91,6 +91,7 @@
     <select id="getOrderListClub" resultType="com.caimei365.order.model.vo.OrderVo">
         SELECT
         orderID AS orderId,
+        shopOrderIds,
         orderSource,
         orderNo,
         userID AS userId,
@@ -164,7 +165,8 @@
     </select>
     <select id="getOrderListByKeyword" resultType="com.caimei365.order.model.vo.OrderVo">
         SELECT DISTINCT
-        orderID AS orderId,
+        co.orderID AS orderId,
+        co.shopOrderIds,
         co.orderSource,
         co.orderNo,
         co.userID AS userId,