getByProductSn 商品增加库存列表

2 years ago · 9247da0df8
4 changed files with 23 additions and 14 deletions
--- a/hiver-admin/src/main/resources/application.yml
+++ b/hiver-admin/src/main/resources/application.yml
@ -25,8 +25,8 @@ spring:
    timeout-per-shutdown-phase: 10S
  # 数据源
  datasource:
-    url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
-#    url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
+#    url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
+    url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
    username: reddoor
    # Jasypt加密 可到common-utils中找到JasyptUtil加解密工具类生成加密结果 格式为ENC(加密结果) 以下解密结果为123456
    password: ENC(Zla4U4+yRLPhicvuX2TmiEgxEpzP4dk8BHzFDEtiEhwLQIIaftZrrEUJZce6efoe)
@ -67,8 +67,8 @@ spring:
      ddl-auto: update
  # Redis 若设有密码自行添加配置password
  redis:
-    host: 154.8.162.157
-#    host: 8.140.198.243
+#    host: 154.8.162.157
+    host: 8.140.198.243
    password: reddoor168
    # 数据库索引 默认0
    database: 1
@ -347,7 +347,7 @@ ignored:
    - /hiver/app/logisticsEntruckingLog/getDateLogisticsEntruckingLogPageList
    - /hiver/app/logisticsEntruckingLog/batchAddLogisticsEntruckingLog
    - /hiver/purchaseOcrPicture/getLogisticsOrderOfAi
-    - /hiver/app/productCategory/**
+    - /hiver/app/product/**
  # 限流及黑名单不拦截的路径
  limitUrls:
    - /**/*.js
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@ -5,7 +5,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-<title>Hiver测试报告</title>
+<title>Hiver测试报告</title>
 <link rel="apple-touch-icon" href="spark/logo.png">
 <link rel="shortcut icon" href="spark/logo.png">
 <link rel="stylesheet" href="spark/spark-style.css">
@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">九月 23, 2024 22:26:15</span></a>
+<a href="#"><span class="badge badge-primary">九月 26, 2024 22:44:51</span></a>
 </li>
 </ul>
 </div>
@ -84,7 +84,7 @@
          <div class="test-detail">
            <span class="meta text-white badge badge-sm"></span>
            <p class="name">passTest</p>
-            <p class="text-sm"><span>22:26:16 下午</span> / <span>0.015 secs</span></p>
+            <p class="text-sm"><span>22:44:52 下午</span> / <span>0.012 secs</span></p>
          </div>
          <div class="test-contents d-none">
 <div class="detail-head">
@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>09.23.2024 22:26:16</span>
-<span class='badge badge-danger'>09.23.2024 22:26:16</span>
-<span class='badge badge-default'>0.015 secs</span>
+<span class='badge badge-success'>09.26.2024 22:44:52</span>
+<span class='badge badge-danger'>09.26.2024 22:44:52</span>
+<span class='badge badge-default'>0.012 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@ -104,7 +104,7 @@
  <tbody>
      <tr class="event-row">
        <td><span class="badge log pass-bg">Pass</span></td>
-        <td>22:26:16</td>
+        <td>22:44:52</td>
        <td>
          Test passed
        </td>
@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>九月 23, 2024 22:26:15</h3>
+<h3>九月 26, 2024 22:44:51</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>九月 23, 2024 22:26:16</h3>
+<h3>九月 26, 2024 22:44:52</h3>
 </div></div>
 </div>
 <div class="col-md-3">
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Product.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Product.java
@ -18,6 +18,7 @@ import javax.persistence.Transient;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;

@Data
@ApiModel(value = "商品表")
@ -128,4 +129,10 @@ public class Product implements Serializable {
    @ApiModelProperty(value = "客户购买数量")
    private Integer buyCount;

+
+    @Transient
+    @TableField(exist = false)
+    @ApiModelProperty(value = "商品库存信息")
+    private List<Stock> stockList;
+
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java
@ -168,6 +168,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
            }
            for (Product product : byProductSn) {
                product.setBuyCount(buyCountMap.getOrDefault(product.getId(), 0));
+                final List<Stock> stockList = stockService.getProductStock(product.getId());
+                product.setStockList(stockList);
            }
        }
        return byProductSn;