From f03debac1b92c3ff1745bf859ed41b891f511bfc Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Tue, 12 Mar 2024 10:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E9=A6=96=E9=A1=B5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=94=80=E9=87=8F=EF=BC=8Cyml=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/productimpl/TbProductServiceImpl.java    | 8 +++++++-
 .../src/main/java/cn/ysk/cashier/vo/TbProductVo.java      | 7 +++++--
 .../src/main/resources/config/application-prod.yml        | 4 ++--
 eladmin-system/src/main/resources/config/application.yml  | 2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

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<TbProductSku> 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:
     #数据库索引