diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index ce2bdef3..d1811403 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -111,13 +111,19 @@ public class TbProductServiceImpl implements TbProductService { for (TbProduct product : page.getContent()) { List skuList = new ArrayList<>(); TbProductVo tbProductVo = new TbProductVo(); - //sku + //sku,并且计算销量以及库存 + Double realSalesNumber = 0.00; + Double stockNumber = 0.00; for (TbProductSku sku : tbProductSkus) { //sku if (sku.getProductId().equals(product.getId().toString())){ skuList.add(sku); } + realSalesNumber = realSalesNumber + sku.getRealSalesNumber(); + stockNumber = stockNumber + sku.getStockNumber(); } + tbProductVo.setRealSalesNumber(realSalesNumber); + tbProductVo.setStockNumber(stockNumber); tbProductVo.setSkuList(skuList); //单位 if (tbShopUnits.isEmpty()){ diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java index b8e2ef72..2265b77f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java @@ -149,8 +149,10 @@ public class TbProductVo { private Double baseSalesNumber; - - private Integer realSalesNumber; + //销量 + private Double realSalesNumber; + //库存 + private Double stockNumber; private Integer salesNumber; @@ -213,4 +215,5 @@ public class TbProductVo { private String specTableHeaders; private String skuSnap; + } diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index dd888256..d0f655ef 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.yml @@ -4,9 +4,9 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:rm-bp1b572nblln4jho2.mysql.rds.aliyuncs.com}:${DB_PORT:3306}/${DB_NAME:fycashier}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: ${DB_USER:root} - password: ${DB_PWD:123456} + password: ${DB_PWD:Czg666888} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml index ad9c02a0..f5e14942 100644 --- a/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin-system/src/main/resources/config/application.yml @@ -26,7 +26,7 @@ spring: properties: hibernate: dialect: org.hibernate.dialect.MySQL5InnoDBDialect - show_sql: false + show_sql: true redis: #数据库索引