From 4fd64cc701de1401f3877350ad740db2e4242cbe Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Mon, 25 Nov 2024 17:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=83=B3=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E5=91=98=E5=B7=A5=E7=9A=84=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E7=9A=84=E8=AF=A6=E7=BB=86=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hiver-admin/test-output/test-report.html      | 16 ++++++++--------
 .../cc/hiver/mall/dao/mapper/SaleMapper.java  |  9 +++++++++
 .../serviceimpl/mybatis/SaleServiceImpl.java  |  8 +++++++-
 .../java/cc/hiver/mall/utils/AliOcrUtil.java  |  2 +-
 .../src/main/resources/mapper/SaleMapper.xml  | 19 ++++++++++++++++++-
 5 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html
index 3204292c..2f3870f2 100644
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@@ -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">十一月 21, 2024 21:56:37</span></a>
+<a href="#"><span class="badge badge-primary">十一月 25, 2024 17:30:25</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>21:56:37 下午</span> / <span>0.016 secs</span></p>
+            <p class="text-sm"><span>17:30:25 下午</span> / <span>0.019 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'>11.21.2024 21:56:37</span>
-<span class='badge badge-danger'>11.21.2024 21:56:37</span>
-<span class='badge badge-default'>0.016 secs</span>
+<span class='badge badge-success'>11.25.2024 17:30:25</span>
+<span class='badge badge-danger'>11.25.2024 17:30:25</span>
+<span class='badge badge-default'>0.019 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>21:56:37</td>
+        <td>17:30:25</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>十一月 21, 2024 21:56:37</h3>
+<h3>十一月 25, 2024 17:30:25</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>十一月 21, 2024 21:56:37</h3>
+<h3>十一月 25, 2024 17:30:25</h3>
 </div></div>
 </div>
 <div class="col-md-3">
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java
index bbf9edfe..1bf6bdf1 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java
@@ -72,6 +72,15 @@ public interface SaleMapper extends BaseMapper<Sale> {
 
     List<CustomerBuySaleVo> getByUserId(@Param("userId") String userId);
 
+    /**
+     * 鏍规嵁寮�鍗曚汉鏌ヨ
+     * @author 鐜嬪瘜搴�
+     * @date 2024/11/25
+     * @param createBy
+     * @return List<CustomerBuySaleVo>
+     */
+    List<CustomerBuySaleVo> getByCreUserId(@Param("createBy") String createBy);
+
     List<SupplierBuyPurchaseVo> getBySupplierId(@Param("supplierId") String supplierId);
 
     List<SupplierBuyProductDetailLogVo> getSupplierBuyProductLogDetailLog(@Param("supplierId") String supplierId, @Param("shopId") String shopId, @Param("productIds") List<String> productIds);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
index 23196122..7a48a061 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
@@ -432,8 +432,14 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa
         for (CustomerBuyProductLogVo record : records) {
             productIds.add(record.getProductId());
         }
+        List<CustomerBuySaleVo> customerBuySaleVoList = new ArrayList<>();
         // 鑾峰彇鍘嗘閿�鍞崟鐨勪俊鎭��
-        final List<CustomerBuySaleVo> customerBuySaleVoList = saleMapper.getByUserId(userId);
+        if(StringUtils.isNotEmpty(userId)){
+            customerBuySaleVoList = saleMapper.getByUserId(userId);
+        }
+        if(StringUtils.isNotEmpty(salePageQuery.getCreateBy())){
+            customerBuySaleVoList = saleMapper.getByCreUserId(salePageQuery.getCreateBy());
+        }
         final Map<String, CustomerBuySaleVo> customerBuySaleVoMap = new HashMap<>();
         for (CustomerBuySaleVo customerBuySaleVo : customerBuySaleVoList) {
             customerBuySaleVoMap.put(customerBuySaleVo.getId(), customerBuySaleVo);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java
index 1e8e34a4..95c2e581 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java
@@ -106,7 +106,7 @@ public class AliOcrUtil {
         messages.add(systemMessage);
         messages.add(userMessage);
         final MultiModalConversationParam param = MultiModalConversationParam.builder()
-                .model("qwen-vl-max")
+                .model("qwen-vl-ocr")
                 .messages(messages)
                 .build();
         stopWatch.start("涓�杞細璇�");
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
index 50b87eca..310c83cb 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
@@ -899,7 +899,15 @@ trans_company, company_name, product_count, remark, sale_name, company_phone, cr
       t_sale_detail
     WHERE
       shop_id = #{salePageQuery.shopId}
-      and sale_id IN ( SELECT id FROM t_sale WHERE user_id = #{salePageQuery.userId} and status not in ('2','6','7'))
+      and sale_id IN ( SELECT id FROM t_sale WHERE status not in ('2','6','7')
+
+    <if test='salePageQuery.userId !=null and salePageQuery.userId !=null'>
+       and user_id = #{salePageQuery.userId}
+    </if>
+    <if test='salePageQuery.createBy !=null and salePageQuery.createBy !=null'>
+      and create_by = #{salePageQuery.createBy}
+    </if>
+                                               )
     <if test='salePageQuery.startDate !=null and salePageQuery.endDate !=null'>
       and create_time BETWEEN #{salePageQuery.startDate} AND #{salePageQuery.endDate}
     </if>
@@ -931,6 +939,15 @@ trans_company, company_name, product_count, remark, sale_name, company_phone, cr
       and status not in ('2','6','7')
   </select>
 
+  <select id="getByCreUserId" resultType="cc.hiver.mall.pojo.vo.CustomerBuySaleVo">
+    SELECT
+      id,create_time,product_count
+    FROM t_sale
+    WHERE
+      create_by = #{createBy}
+      and status not in ('2','6','7')
+  </select>
+
   <select id="queryTotalAlreadyEarnDetail" resultType="cc.hiver.mall.pojo.vo.TotalAlreadyEarnDetailVo">
     select  (CASE WHEN pay_type is NULL THEN 5 ELSE pay_type END) as pay_type,IFNULL(Sum(already_earn),0.00) as pay_amount
     from t_sale