diff --git a/README.md b/README.md index 77ef48c8..a2582700 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,11 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2 - 3、本地上传与七牛云上传合并，修改一个yml即可两者随意切换 - 4、升级swagger-bootstrap,swaager统一配置迁移到common(防止注解冲突) - 5、后台优化操作显示 + - yshop1.8.1发布更新如下： + - 1、修复库存问题#I17Z5X + - 2、修复评价百分比精度问题#I17UQY + - 3、修复评价列表问题#I17TZC + - 4、移动端图片上传修改为统一处理 #### 反馈交流 diff --git a/shell/start.sh b/shell/start.sh index 48da0d43..f2ea1323 100644 --- a/shell/start.sh +++ b/shell/start.sh @@ -1 +1 @@ -nohup java -jar yshop-api-1.7.jar --spring.profiles.active=prod & \ No newline at end of file +nohup java -jar yshop-api-1.8.jar --spring.profiles.active=prod & \ No newline at end of file diff --git a/shell/stop.sh b/shell/stop.sh index 45a56bac..d3095c45 100644 --- a/shell/stop.sh +++ b/shell/stop.sh @@ -1,4 +1,4 @@ -PID=$(ps -ef | grep yshop-api-1.7.jar | grep -v grep | awk '{ print $2 }') +PID=$(ps -ef | grep yshop-api-1.8.jar | grep -v grep | awk '{ print $2 }') if [ -z "$PID" ];then echo Application is already stopped else diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrValueMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrValueMapper.java index 8069c100..b58c2e8a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrValueMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrValueMapper.java @@ -7,6 +7,7 @@ import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.web.param.YxStoreProductAttrValueQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrValueQueryVo; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; @@ -23,6 +24,10 @@ import java.io.Serializable; @Repository public interface YxStoreProductAttrValueMapper extends BaseMapper { + @Select("select sum(stock) from yx_store_product_attr_value " + + "where product_id = #{productId}") + Integer sumStock(Integer productId); + @Update("update yx_store_product_attr_value set stock=stock-#{num}, sales=sales+#{num}" + " where product_id=#{productId} and `unique`=#{unique}") int decStockIncSales(@Param("num") int num,@Param("productId") int productId, diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java index a5b1cc03..eb584668 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java @@ -45,7 +45,7 @@ public interface YxStoreProductReplyMapper extends BaseMapperand A.product_score < 5 and A.product_score > 2" + "and A.product_score < 2"+ " order by A.add_time DESC") - List selectReplyList(Page page, @Param("productId") int productId,int type); + List selectReplyList(Page page, @Param("productId") int productId,@Param("type") int type); /** * 根据ID获取查询对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index 7acd292c..13a6b581 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -83,8 +83,8 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl 0){ - return ""+NumberUtil.mul(NumberUtil.div(productScoreCount,count),100); + return ""+NumberUtil.round(NumberUtil.mul(NumberUtil.div(productScoreCount,count),100),2); } return "0"; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index c1d7fafe..68fd6581 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -7,6 +7,7 @@ import co.yixiang.modules.shop.entity.YxStoreCategory; import co.yixiang.modules.shop.entity.YxStoreProduct; import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.mapper.YxStoreCategoryMapper; +import co.yixiang.modules.shop.mapper.YxStoreProductAttrValueMapper; import co.yixiang.modules.shop.mapper.YxStoreProductMapper; import co.yixiang.modules.shop.mapping.YxStoreProductMap; import co.yixiang.modules.shop.service.*; @@ -65,6 +66,9 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl returnMap = storeProductAttrService.getProductAttrDetail(id,0,0); ProductDTO productDTO = new ProductDTO(); YxStoreProductQueryVo storeProductQueryVo = storeProductMap.toDto(storeProduct); + + //处理库存 + Integer newStock = storeProductAttrValueMapper.sumStock(id); + if(newStock != null) storeProductQueryVo.setStock(newStock); + //设置VIP价格 double vipPrice = userService.setLevelPrice( storeProductQueryVo.getPrice().doubleValue(),uid); diff --git a/yshop-api/src/main/resources/config/application-dev.yml b/yshop-api/src/main/resources/config/application-dev.yml index d69f2523..bb6c0eba 100644 --- a/yshop-api/src/main/resources/config/application-dev.yml +++ b/yshop-api/src/main/resources/config/application-dev.yml @@ -73,7 +73,7 @@ swagger: enabled: true title: yshop商城移动端API serverUrl: http://localhost:8009 - version: 1.7 + version: 1.8 # 文件存储路径 file: @@ -82,7 +82,7 @@ file: # 文件大小 /M maxSize: 100 avatarMaxSize: 5 - localUrl: http://localhost:8000 + localUrl: http://localhost:8009/api yshop: #通知相关配置 notify: diff --git a/yshop-api/src/main/resources/config/application-prod.yml b/yshop-api/src/main/resources/config/application-prod.yml index c95d2235..e63df35f 100644 --- a/yshop-api/src/main/resources/config/application-prod.yml +++ b/yshop-api/src/main/resources/config/application-prod.yml @@ -93,7 +93,7 @@ file: # 文件大小 /M maxSize: 100 avatarMaxSize: 5 - localUrl: http://localhost:8000 + localUrl: yshop: #通知相关配置 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java index 27e8b08a..bf1b5694 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java @@ -3,6 +3,7 @@ package co.yixiang.modules.shop.repository; import co.yixiang.modules.shop.domain.YxStoreProductAttr; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; /** * @author hupeng @@ -12,4 +13,7 @@ public interface YxStoreProductAttrRepository extends JpaRepository map = new LinkedHashMap<>(2); diff --git a/yshop-system/src/main/resources/config/application-dev.yml b/yshop-system/src/main/resources/config/application-dev.yml index b1dce641..7a86ac1a 100644 --- a/yshop-system/src/main/resources/config/application-dev.yml +++ b/yshop-system/src/main/resources/config/application-dev.yml @@ -76,7 +76,7 @@ swagger: enabled: true title: yshop商城管理后台API serverUrl: http://localhost:8000 - version: 1.7 + version: 1.8 # 文件存储路径 file: @@ -85,4 +85,4 @@ file: # 文件大小 /M maxSize: 100 avatarMaxSize: 5 - localUrl: \ No newline at end of file + localUrl: http://localhost:8000 \ No newline at end of file diff --git a/yshop-system/src/main/resources/config/application-prod.yml b/yshop-system/src/main/resources/config/application-prod.yml index 535fa49d..4002c286 100644 --- a/yshop-system/src/main/resources/config/application-prod.yml +++ b/yshop-system/src/main/resources/config/application-prod.yml @@ -6,7 +6,7 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: yshop - password: + password: # 初始化配置 initial-size: 3 @@ -81,7 +81,7 @@ swagger: enabled: true title: yshop商城管理后台API serverUrl: http://localhost:8000 - version: 1.7 + version: 1.8 # 文件存储路径 file: