dd

ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/groupbuy/service/impl/GroupBuyTeamMemberServiceImpl.java

@@ -93,8 +93,7 @@ public class GroupBuyTeamMemberServiceImpl implements IGroupBuyTeamMemberService
         lqw.eq(bo.getTotalReduced() != null, GroupBuyTeamMember::getTotalReduced, bo.getTotalReduced());
         lqw.eq(bo.getRealFreight() != null, GroupBuyTeamMember::getRealFreight, bo.getRealFreight());
         lqw.eq(bo.getTotalAmount() != null, GroupBuyTeamMember::getTotalAmount, bo.getTotalAmount());
-        lqw.eq(bo.getOrderDetialId() != null, GroupBuyTeamMember::getOrderDetailId, bo.getOrderDetialId());
-        lqw.eq(bo.getShopOrderId() != null, GroupBuyTeamMember::getBusinessId, bo.getShopOrderId());
+        lqw.eq(bo.getOrderDetailId() != null, GroupBuyTeamMember::getOrderDetailId, bo.getOrderDetailId());
         return lqw;
     }
 

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/createorder/impl/AbstractCreateOrderService.java

@@ -41,6 +41,7 @@ import com.ruoyi.user.service.IUserService;
 import com.ruoyi.useraddress.domain.UserAddress;
 import com.ruoyi.useraddress.service.IUserAddressService;
 import lombok.extern.slf4j.Slf4j;
+import org.simpleframework.xml.Default;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -136,8 +137,12 @@ public abstract class AbstractCreateOrderService implements ICreateOrderService
         return order;
     }
 
-    protected abstract  ProductSkuSetVo biuldProductSkuSetVo(CreateOrderBo createOrderBo,CreateOrderDetailBo createOrderDetailBo);
 
+    protected ProductSkuSetVo biuldProductSkuSetVo(CreateOrderBo createOrderBo, CreateOrderDetailBo createOrderDetailBo) {
+        return  productSkuSetService.loadVoByBusinessIdAndProductIdAndSkuHash(createOrderBo.getBusinessId(),
+            createOrderDetailBo.getProductId(),
+            createOrderDetailBo.getSkuHashCode(), true);
+    }
     /**
      * 构建基础订单详情列表
      *

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/createorder/impl/CreateCommonOrderService.java

@@ -73,10 +73,4 @@ public class CreateCommonOrderService extends AbstractCreateOrderService impleme
         return shopOrderBo;
     }
 
-    @Override
-    protected ProductSkuSetVo biuldProductSkuSetVo(CreateOrderBo createOrderBo, CreateOrderDetailBo createOrderDetailBo) {
-        return  productSkuSetService.loadVoByBusinessIdAndProductIdAndSkuHash(createOrderBo.getBusinessId(),
-            createOrderDetailBo.getProductId(),
-            createOrderDetailBo.getSkuHashCode(), true);
-    }
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/createorder/impl/CreateGroupBuyOrderService.java

@@ -49,6 +49,7 @@ public class CreateGroupBuyOrderService extends AbstractCreateOrderService imple
         }
         ShopOrder orderEntity = createOrderEntity(shopOrderBo);
 
+
         return orderEntity;
     }
 

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/createorder/impl/CreateOrderServiceImpl.java

@@ -3,7 +3,9 @@ package com.ruoyi.shop.order.service.createorder.impl;
 import com.ruoyi.shop.order.domain.ShopOrder;
 import com.ruoyi.shop.order.domain.bo.ShopOrderBo;
 import com.ruoyi.shop.order.domain.bo.createorder.CreateOrderBo;
+import com.ruoyi.shop.order.domain.bo.createorder.CreateOrderDetailBo;
 import com.ruoyi.shop.order.service.createorder.ICreateOrderService;
+import com.ruoyi.shop.product.domain.vo.ProductSkuSetVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -46,4 +48,5 @@ public class CreateOrderServiceImpl extends AbstractCreateOrderService implement
         }
         return createCommonOrderService.buildOrder(createOrderBo);
     }
+
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/createorder/impl/CreatePointExchangeOrderService.java

@@ -7,6 +7,7 @@ import com.ruoyi.shop.order.domain.bo.createorder.CreateOrderBo;
 import com.ruoyi.shop.order.domain.bo.createorder.CreateOrderDetailBo;
 import com.ruoyi.shop.order.exception.ShopOrderExceptionEnum;
 import com.ruoyi.shop.order.service.createorder.ICreateOrderService;
+import com.ruoyi.shop.product.domain.vo.ProductSkuSetVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -41,4 +42,5 @@ public class CreatePointExchangeOrderService extends AbstractCreateOrderService
         freightHandle(shopOrderBo);
         return shopOrderBo;
     }
+
 }

ruoyi-shop/src/main/resources/mapper/marketing/groupbuy/GroupBuyActivityGoodsMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="resultSaleNum" column="result_sale_num"/>
         <result property="groupPeopleNum" column="group_people_num"/>
         <result property="residueStockTotal" column="residue_stock_total"/>
-        <result property="skuTable" column="sku_table"/>
+        <result property="skuTable" column="sku_table" typeHandler="com.ruoyi.shop.typehandler.ListToSkuItemTypeHandler"/>
         <result property="minSalePrice" column="min_sale_price"/>
         <result property="maxSalePrice" column="max_sale_price"/>
         <result property="createTime" column="create_time"/>