Merge branch 'master' of http://115.29.66.169:10080/new-base-shop/api

ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/SeckillActivityProduct.java

@@ -137,7 +137,7 @@ public class SeckillActivityProduct extends BaseEntity {
      */
     public void loadProductSkuSetList() {
         IProductSkuSetService service = SpringUtil.getBean("productSkuSetServiceImpl", IProductSkuSetService.class);
-        this.productSkuSetList = service.loadVoByBusinessIdAndProductIdAndActivityProductId(this.businessId, this.productId, this.id, MarketingType.GROUP);
+        this.productSkuSetList = service.loadVoByBusinessIdAndProductIdAndActivityProductId(this.businessId, this.productId, this.id, MarketingType.SECKILL);
         this.residueStockTotal = this.productSkuSetList.stream().mapToInt(ProductSkuSetVo::getStock).sum();
     }
 

ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/service/impl/SeckillActivityProductServiceImpl.java

@@ -439,6 +439,8 @@ public class SeckillActivityProductServiceImpl implements ISeckillActivityProduc
         for (SeckillActivityProduct seckillActivityProduct : seckillActivityProducts) {
             //1、还库存到普通商品
             productSkuSetStockService.returnActivityStock(seckillActivityProduct);
+            seckillActivityProduct.loadProductSkuSetList();
+            baseMapper.updateById(seckillActivityProduct);
             //创建信号量
             createAndSetSemaphore(seckillActivityProduct);
         }

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

@@ -202,7 +202,6 @@ public class CreateGroupBuyOrderService extends AbstractCreateOrderService imple
         shopOrderBo.setActivityId(createOrderBo.getActivityId());
         GroupBuyActivity groupBuyActivity = groupBuyActivityService.loadById(createOrderBo.getActivityId(), true);
         shopOrderBo.setActivityTitle(groupBuyActivity.getName());
-        shopOrderBo.setSponsorActivityId(groupBuyActivity.getId());
         return shopOrderBo;
     }
 

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

@@ -191,7 +191,6 @@ public class CreateSeckillOrderService extends AbstractCreateOrderService implem
         shopOrderBo.setActivityId(createOrderBo.getActivityId());
         SeckillActivity seckillActivity = seckillActivityService.loadById(createOrderBo.getActivityId(), true);
         shopOrderBo.setActivityTitle(seckillActivity.getName());
-        shopOrderBo.setSponsorActivityId(seckillActivity.getId());
         return shopOrderBo;
     }
 

ruoyi-shop/src/main/resources/mapper/product/ProductSkuSetMapper.xml

@@ -92,8 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActivitySQl" />
     </select>
 
-    <insert id="loadVoByBusinessIdAndProductIdAndActivityProductIdAndSkuHash">
+    <select id="loadVoByBusinessIdAndProductIdAndActivityProductIdAndSkuHash" resultMap="ProductSkuSetResultVo">
         <include refid="selectActivitySQl" />
         and tss.sku_hash_code = #{skuHashCode}
-    </insert>
+    </select>
 </mapper>