获取客户增加店铺过滤。对账单返回交易记录的人员姓名

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-success'>11.06.2024 09:30:15</span>
-<span class='badge badge-danger'>11.04.2024 16:58:17</span>
+<span class='badge badge-danger'>11.06.2024 09:30:15</span>
-<span class='badge badge-default'>0.017 secs</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">

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;
 

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);
     }
 

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();
         // 查询下游客户的id
-        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())) {

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);
 

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);
 

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) {
+    public List<String> findByUserId(String userId,String shopId) {
-        return customerMapper.findByUserId(userId);
+        return customerMapper.findByUserId(userId, shopId);
     }
 
     @Override

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">

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,