| Pass |
- 16:58:17 |
+ 9:30:15 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
十一月 04, 2024 16:58:16
+
十一月 06, 2024 09:30:15
Ended
-
十一月 04, 2024 16:58:17
+
十一月 06, 2024 09:30:15
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 list = customerService.findByUserId(userId);
+ final List list = customerService.findByUserId(userId,shopId);
return new ResultUtil>().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 queryWrapper = new QueryWrapper<>();
final User user = securityUtil.getCurrUser();
// 鏌ヨ涓嬫父瀹㈡埛鐨刬d
- final List customerIdList = customerService.findByUserId(user.getId());
+ final List 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 {
void delById(String id);
- List findByUserId(String userId);
+ List findByUserId(@Param("userId") String userId,@Param("shopId") String shopId);
Page getCustomerList(Page 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 {
boolean deleteById(String id);
- List findByUserId(String userId);
+ List 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 i
}
@Override
- public List findByUserId(String userId) {
- return customerMapper.findByUserId(userId);
+ public List 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}
+
+ and a.shop_id = #{shopId,jdbcType=VARCHAR}
+
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,