协销再来一单

src/main/java/com/caimei365/order/controller/CartSellerApi.java

@@ -211,7 +211,6 @@ public class CartSellerApi {
      *
      * @param againBuyDto {
      *                    serviceProviderId      协销Id
-     *                    clubId                 机构ID
      *                    orderId                订单Id
      *                    confirmFlag            确认标识 0未确认 1已确认-将失效商品以外的正常商品加入购物车
      *                    }
@@ -222,9 +221,6 @@ public class CartSellerApi {
         if (null == againBuyDto.getServiceProviderId()) {
             return ResponseJson.error("协销Id不能为空！", null);
         }
-        if (null == againBuyDto.getClubId()) {
-            return ResponseJson.error("机构Id不能为空！", null);
-        }
         if (null == againBuyDto.getOrderId()) {
             return ResponseJson.error("订单Id不能为空！", null);
         }

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

@@ -100,6 +100,11 @@ public interface CartSellerMapper {
      * @param orderId 订单Id
      */
     Integer getOrderUserIdByOrderId(Integer orderId);
+    /**
+     * 获取订单里用户Id
+     * @param orderId 订单Id
+     */
+    Integer getOrderClubIdByOrderId(Integer orderId);
     /**
      * 获取订单商品的商品数量列表
      * @param orderId 订单Id

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

@@ -19,11 +19,6 @@ public class AgainBuyDto implements Serializable {
      */
     @ApiModelProperty("协销id")
     private Integer serviceProviderId;
-    /**
-     * 机构id
-     */
-    @ApiModelProperty("机构id")
-    private Integer clubId;
     /**
      * 订单id
      */

src/main/java/com/caimei365/order/service/CartSellerService.java

@@ -88,7 +88,6 @@ public interface CartSellerService {
      *
      * @param againBuyDto {
      *                    serviceProviderId      协销Id
-     *                    clubId                 机构ID
      *                    orderId                订单Id
      *                    confirmFlag            确认标识 0未确认 1已确认-将失效商品以外的正常商品加入购物车
      *                    }

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

@@ -681,7 +681,6 @@ public class CartSellerServiceImpl implements CartSellerService {
      *
      * @param againBuyDto {
      *                    serviceProviderId      协销Id
-     *                    clubId                 机构ID
      *                    orderId                订单Id
      *                    confirmFlag            确认标识 0未确认 1已确认-将失效商品以外的正常商品加入购物车
      *                    }
@@ -692,16 +691,17 @@ public class CartSellerServiceImpl implements CartSellerService {
         Map<String, Object> resultData = new HashMap<>();
         // 获取订单里用户Id
         Integer orderUserId = cartSellerMapper.getOrderUserIdByOrderId(againBuyDto.getOrderId());
-        if (null == orderUserId || orderUserId == 0) {
+        Integer orderClubId = cartSellerMapper.getOrderClubIdByOrderId(againBuyDto.getOrderId());
+        if (null == orderUserId || orderUserId == 0 || null == orderClubId || orderClubId == 0) {
             return ResponseJson.error("订单异常或不存在！", null);
         }
         List<CartItemVo> productList = cartSellerMapper.getOrderProductNum(againBuyDto.getOrderId());
         // 总商品种类数量
-        Integer total = productList.size();
+        int total = productList.size();
         // 移除失效商品
         productList.removeIf(cartItemVo -> (null == cartItemVo || null == cartItemVo.getValidFlag() || (cartItemVo.getValidFlag() != 2 && cartItemVo.getValidFlag() != 3 && cartItemVo.getValidFlag() != 9)));
         // 失效商品数量
-        Integer invalid = total - productList.size();
+        int invalid = total - productList.size();
         if (productList.size() == 0) {
             return ResponseJson.error(-2, "订单内的商品已全部失效，不能下单！", null);
         }
@@ -712,7 +712,7 @@ public class CartSellerServiceImpl implements CartSellerService {
         // 订单商品加入协销购物车
         SellerCartDto cart = new SellerCartDto();
         cart.setServiceProviderId(againBuyDto.getServiceProviderId());
-        cart.setClubId(againBuyDto.getClubId());
+        cart.setClubId(orderClubId);
         productList.forEach(cartItemVo -> {
             cart.setProductId(cartItemVo.getProductId());
             cart.setProductCount(cartItemVo.getNumber());
@@ -720,7 +720,7 @@ public class CartSellerServiceImpl implements CartSellerService {
         });
         // 包装返回数据
         resultData.put("userId", orderUserId);
-        resultData.put("clubId", againBuyDto.getClubId());
+        resultData.put("clubId", orderClubId);
         resultData.put("productList", productList);
         return ResponseJson.success(resultData);
     }

src/main/resources/mapper/CartSellerMapper.xml

@@ -158,6 +158,10 @@
         SELECT userID FROM cm_order
         WHERE orderID = #{orderId} AND delFlag = '0'
     </select>
+    <select id="getOrderClubIdByOrderId" resultType="java.lang.Integer">
+        SELECT clubID FROM cm_order
+        WHERE orderID = #{orderId} AND delFlag = '0'
+    </select>
     <select id="getOrderProductNum" resultType="com.caimei365.order.model.vo.CartItemVo">
         SELECT
             op.ProductID AS productId,