From d4c5b5dfbb734ef399f39c0af0f33cd5be2f61a5 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Wed, 6 Nov 2024 14:35:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BA=97=E9=93=BA=E8=BF=87=E6=BB=A4=E3=80=82=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=E8=BF=94=E5=9B=9E=E4=BA=A4=E6=98=93=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E4=BA=BA=E5=91=98=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hiver-admin/test-output/test-report.html         | 16 ++++++++--------
 .../hiver/mall/bill/vo/CustomerBillSaleVo.java   |  3 +++
 .../mall/controller/CustomerController.java      |  4 ++--
 .../cc/hiver/mall/controller/SaleController.java |  2 +-
 .../cc/hiver/mall/dao/mapper/CustomerMapper.java |  2 +-
 .../mall/service/mybatis/CustomerService.java    |  2 +-
 .../serviceimpl/mybatis/CustomerServiceImpl.java |  4 ++--
 .../src/main/resources/mapper/CustomerMapper.xml |  3 +++
 .../resources/mapper/DealingsRecordMapper.xml    |  1 +
 9 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html
index dc777ae8..50a3e3c7 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">十一月 04, 2024 16:58:16</span></a>
+<a href="#"><span class="badge badge-primary">十一月 06, 2024 09:30:15</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>16:58:17 下午</span> / <span>0.017 secs</span></p>
+            <p class="text-sm"><span>09:30:15 上午</span> / <span>0.016 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.04.2024 16:58:17</span>
-<span class='badge badge-danger'>11.04.2024 16:58:17</span>
-<span class='badge badge-default'>0.017 secs</span>
+<span class='badge badge-success'>11.06.2024 09:30:15</span>
+<span class='badge badge-danger'>11.06.2024 09:30:15</span>
+<span class='badge badge-default'>0.016 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>16:58:17</td>
+        <td>9:30:15</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>十一月 04, 2024 16:58:16</h3>
+<h3>十一月 06, 2024 09:30:15</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>十一月 04, 2024 16:58:17</h3>
+<h3>十一月 06, 2024 09:30:15</h3>
 </div></div>
 </div>
 <div class="col-md-3">
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/CustomerBillSaleVo.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/CustomerBillSaleVo.java
index 3c7ec7da..8e7d6e81 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/CustomerBillSaleVo.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/CustomerBillSaleVo.java
@@ -62,6 +62,9 @@ public class CustomerBillSaleVo {
     @ApiModelProperty(value = "鍒犻櫎鏍囪瘑")
     private Integer delFlag;
 
+    @ApiModelProperty(value = "褰撴椂浜ゆ槗鐨勫悕绉�")
+    private String dealingsUserName;
+
     @ApiModelProperty(value = "澶囨敞")
     private String remark;
 
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java
index 4fe18e06..2261d2e3 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java
@@ -213,9 +213,9 @@ public class CustomerController {
 
     @RequestMapping(value = "/findByUserId", method = RequestMethod.POST)
     @ApiOperation("鏍规嵁鐢ㄦ埛id鏌ヨ瀹㈡埛鍒楄〃")
-    public Result findByUserId(String userId) {
+    public Result findByUserId(String userId,String shopId) {
         // shopId浠庣紦瀛樹腑璁剧疆
-        final List<String> list = customerService.findByUserId(userId);
+        final List<String> list = customerService.findByUserId(userId,shopId);
         return new ResultUtil<List<String>>().setData(list);
     }
 
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
index eeef9330..553e6e68 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
@@ -389,7 +389,7 @@ public class SaleController {
         final QueryWrapper<Sale> queryWrapper = new QueryWrapper<>();
         final User user = securityUtil.getCurrUser();
         // 鏌ヨ涓嬫父瀹㈡埛鐨刬d
-        final List<String> customerIdList = customerService.findByUserId(user.getId());
+        final List<String> customerIdList = customerService.findByUserId(user.getId(),"");
         queryWrapper.in("user_id", customerIdList);
         if (!ObjectUtils.isEmpty(saleVO)) {
             if (!StringUtils.isEmpty(saleVO.getPayStatus())) {
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java
index 692475ec..85bb3941 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java
@@ -39,7 +39,7 @@ public interface CustomerMapper extends BaseMapper<Customer> {
 
     void delById(String id);
 
-    List<String> findByUserId(String userId);
+    List<String> findByUserId(@Param("userId") String userId,@Param("shopId") String shopId);
 
     Page<Customer> getCustomerList(Page<Customer> page,@Param("queryParams") CustomerPageQuery customerPageQuery);
 
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/CustomerService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/CustomerService.java
index e5f0aa42..89a7fd6c 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/CustomerService.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/CustomerService.java
@@ -15,7 +15,7 @@ public interface CustomerService extends IService<Customer> {
 
     boolean deleteById(String id);
 
-    List<String> findByUserId(String userId);
+    List<String> findByUserId(String userId,String shopId);
 
     Customer addCustomer(Customer customer);
 
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java
index bae90c47..4ca6b60c 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java
@@ -84,8 +84,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     }
 
     @Override
-    public List<String> findByUserId(String userId) {
-        return customerMapper.findByUserId(userId);
+    public List<String> findByUserId(String userId,String shopId) {
+        return customerMapper.findByUserId(userId, shopId);
     }
 
     @Override
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml
index d229ff5e..37d65f49 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml
@@ -484,6 +484,9 @@
     select id
     from t_customer a
     where a.user_id = #{userId,jdbcType=VARCHAR}
+    <if test=" shopId != null and shopId != ''">
+      and a.shop_id = #{shopId,jdbcType=VARCHAR}
+    </if>
   </select>
 
   <update id="updatePhone">
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml
index 420b90c6..5d9bd77b 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml
@@ -142,6 +142,7 @@
         tdr.balance_due,
         tdr.dealings_type,
         tdr.del_flag,
+        tdr.dealings_user_name,
         ts.total_amount,
         ts.debt_deduction_amount,
         ts.sale_deduction_amount,