From fc781e840354a432f3ba9c46016175a64e7f6ad7 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Sun, 6 Sep 2020 09:40:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=8B=BC=E5=9B=A2=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E6=97=B6=E7=9A=84=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yshop-admin/src/main/resources/logback.xml | 7 ++++++- yshop-app/src/main/resources/logback.xml | 7 ++++++- .../activity/service/mapper/YxStoreCombinationMapper.java | 6 +++--- .../product/service/impl/YxStoreProductServiceImpl.java | 7 +------ .../service/mapper/StoreProductAttrValueMapper.java | 4 ++-- .../modules/product/service/mapper/StoreProductMapper.java | 2 +- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/yshop-admin/src/main/resources/logback.xml b/yshop-admin/src/main/resources/logback.xml index acf218c7..33eade18 100644 --- a/yshop-admin/src/main/resources/logback.xml +++ b/yshop-admin/src/main/resources/logback.xml @@ -1,8 +1,13 @@ + + + + + yshop - + diff --git a/yshop-app/src/main/resources/logback.xml b/yshop-app/src/main/resources/logback.xml index 21f3201a..d8f64003 100644 --- a/yshop-app/src/main/resources/logback.xml +++ b/yshop-app/src/main/resources/logback.xml @@ -1,8 +1,13 @@ + + + + + yshop - + diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java index b20d249e..643bc329 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java @@ -34,7 +34,7 @@ public interface YxStoreCombinationMapper extends CoreMapper " where id=#{combinationId}") int incStockDecSales(@Param("num") int num,@Param("combinationId") Long combinationId); - @Select("SELECT c.id,c.effective_time as effectiveTime,c.image,c.people,c.price," + + @Select("SELECT c.id,c.effective_time as effectiveTime,c.image,c.people,c.price, s.sales as sales," + "c.title,c.unit_name as unitName,s.price as productPrice FROM yx_store_combination c " + "INNER JOIN yx_store_product s ON s.id=c.product_id " + " WHERE c.is_show = 1 AND c.is_del = 0 AND c.start_time < now() " + @@ -42,7 +42,7 @@ public interface YxStoreCombinationMapper extends CoreMapper List getCombList(Page page); @Select("SELECT c.id,c.effective_time as effectiveTime,c.image,c.people,c.price,c.browse," + - "c.description,c.image,c.images,c.info,c.is_postage as isPostage,c.postage," + + "c.description,c.image,c.images,c.info," + "c.product_id as productId,c.sales,c.start_time as startTime" + ",c.stock,c.stop_time stopTime," + "c.title,c.unit_name as unitName,s.price as productPrice FROM yx_store_combination c " + @@ -51,7 +51,7 @@ public interface YxStoreCombinationMapper extends CoreMapper YxStoreCombinationQueryVo getCombDetail(Long id); @Select("SELECT c.id,c.image,c.price,c.title as storeName,c.is_show as isShow,c.cost," + - "c.is_postage as isPostage,c.postage,c.sales,c.stock,c.is_del as isDel" + + "c.sales,c.stock,c.is_del as isDel" + " FROM yx_store_combination c " + " WHERE c.id = #{id} and c.is_del = 0 ") YxStoreProductQueryVo combinatiionInfo(Long id); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java index df980e75..27c27572 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java @@ -139,13 +139,8 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl= #{num} and pink_stock>=#{num}") int decCombinationStockIncSales(int num, Long productId, String unique); - @Update("update yx_store_product_attr_value set stock=stock-#{num}, seckill_stock=seckill_stock-#{num} sales=sales+#{num}" + + @Update("update yx_store_product_attr_value set stock=stock-#{num}, seckill_stock=seckill_stock-#{num},sales=sales+#{num}" + " where product_id=#{productId} and `unique`=#{unique} and stock >= #{num} and seckill_stock>=#{num}") int decSeckillStockIncSales(int num, Long productId, String unique); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/StoreProductMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/StoreProductMapper.java index 36ec166e..97574375 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/StoreProductMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/StoreProductMapper.java @@ -48,7 +48,7 @@ public interface StoreProductMapper extends CoreMapper { @Update("update yx_store_combination set stock=stock-#{num}, sales=sales+#{num}" + " where id=#{activityId} and stock >= #{num}") int decCombinationStockIncSales(int num, Long productId,Long activityId); - //todo 拼团商品库存+— + //todo 秒杀商品库存+— @Update("update yx_store_seckill set stock=stock-#{num}, sales=sales+#{num}" + " where id=#{activityId} and stock >= #{num}") int decSeckillStockIncSales(int num, Long productId,Long activityId);