From 36687abe0f240bf45ddbd5d1e5eb0f4d3f4a9fc3 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 28 Apr 2026 15:37:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E8=B4=A6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/CreditBuyerController.java | 5 +- .../order/param/CreditBuyerQueryParam.java | 32 ++++++--- .../czg/order/service/CreditBuyerService.java | 3 +- .../order/mapper/CreditBuyerMapper.java | 5 -- .../service/impl/CreditBuyerServiceImpl.java | 26 ++++--- .../resources/mapper/CreditBuyerMapper.xml | 70 ------------------- 6 files changed, 43 insertions(+), 98 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/CreditBuyerController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/CreditBuyerController.java index 517f3cb47..7fc7ce359 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/CreditBuyerController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/CreditBuyerController.java @@ -1,7 +1,6 @@ package com.czg.controller.admin; import com.czg.log.annotation.OperationLog; -import com.czg.order.dto.CreditBuyerDTO; import com.czg.order.entity.CreditBuyer; import com.czg.order.param.CreditBuyerQueryParam; import com.czg.order.param.CreditBuyerRepaymentParam; @@ -32,8 +31,8 @@ public class CreditBuyerController { @GetMapping("page") @OperationLog("挂账人-分页") //@SaAdminCheckPermission("creditBuyer:page") - public CzgResult> getCreditBuyerPage(CreditBuyerQueryParam param) { - Page data = creditBuyerService.getCreditBuyerPage(param); + public CzgResult> getCreditBuyerPage(CreditBuyerQueryParam param) { + Page data = creditBuyerService.getCreditBuyerPage(param); return CzgResult.success(data); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/CreditBuyerQueryParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/CreditBuyerQueryParam.java index 4dfa7c2b3..33ef0ffc7 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/CreditBuyerQueryParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/CreditBuyerQueryParam.java @@ -1,6 +1,7 @@ package com.czg.order.param; import com.alibaba.fastjson2.annotation.JSONField; +import com.czg.utils.CzgStrUtils; import lombok.Data; import java.io.Serial; @@ -23,24 +24,39 @@ public class CreditBuyerQueryParam implements Serializable { @JSONField(serialize = false) private String id; /** - * 关键字 + * 挂账人 */ - private String keywords; + private String debtor; /** - * 还款状态 unpaid-未还款 partial-部分还款 paid-已还清 + * 手机号 */ - private String repaymentStatus; - /** - * 责任人 - */ - private String responsiblePerson; + private String mobile; /** * 状态 1-启用 0-停用 */ private Integer status; + + /** + * 还款状态 1 有欠款 2 无欠款 + */ + private Integer repaymentStatus; /** * 店铺id */ @JSONField(serialize = false) private Long shopId; + + public String getMobile() { + return CzgStrUtils.getStrOrNull(mobile); + } + + + public String getDebtor() { + return CzgStrUtils.getStrOrNull(debtor); + } + + public String getId() { + return CzgStrUtils.getStrOrNull(id); + } + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/CreditBuyerService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/CreditBuyerService.java index fc72cfcec..e6e3241bb 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/CreditBuyerService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/CreditBuyerService.java @@ -1,6 +1,5 @@ package com.czg.order.service; -import com.czg.order.dto.CreditBuyerDTO; import com.czg.order.entity.CreditBuyer; import com.czg.order.param.CreditBuyerQueryParam; import com.czg.order.param.CreditBuyerRepaymentParam; @@ -15,7 +14,7 @@ import com.mybatisflex.core.service.IService; * @since 1.0 2025-03-04 */ public interface CreditBuyerService extends IService { - Page getCreditBuyerPage(CreditBuyerQueryParam param); + Page getCreditBuyerPage(CreditBuyerQueryParam param); void addCreditBuyer(CreditBuyer dto); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/CreditBuyerMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/CreditBuyerMapper.java index 45d370199..90b8a6152 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/CreditBuyerMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/CreditBuyerMapper.java @@ -1,13 +1,9 @@ package com.czg.service.order.mapper; -import com.czg.order.dto.CreditBuyerDTO; import com.czg.order.entity.CreditBuyer; -import com.czg.order.param.CreditBuyerQueryParam; import com.mybatisflex.core.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - /** * 挂账人 * @@ -17,6 +13,5 @@ import java.util.List; @Mapper public interface CreditBuyerMapper extends BaseMapper { - List findCreditBuyerList(CreditBuyerQueryParam param); } \ No newline at end of file diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/CreditBuyerServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/CreditBuyerServiceImpl.java index 198795d48..a0c4525ee 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/CreditBuyerServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/CreditBuyerServiceImpl.java @@ -10,7 +10,6 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.czg.constants.SystemConstants; import com.czg.exception.CzgException; -import com.czg.order.dto.CreditBuyerDTO; import com.czg.order.dto.CreditBuyerOrderDTO; import com.czg.order.entity.CreditBuyer; import com.czg.order.entity.CreditBuyerOrder; @@ -25,10 +24,8 @@ import com.czg.service.order.mapper.CreditBuyerMapper; import com.czg.service.order.mapper.CreditBuyerOrderMapper; import com.czg.service.order.mapper.CreditPaymentRecordMapper; import com.czg.utils.PageUtil; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.github.pagehelper.PageParam; import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; @@ -56,13 +53,22 @@ public class CreditBuyerServiceImpl extends ServiceImpl getCreditBuyerPage(CreditBuyerQueryParam param) { - PageParam pageParam = PageUtil.buildPageHelp(); - PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize(), pageParam.getOrderBy()); + public Page getCreditBuyerPage(CreditBuyerQueryParam param) { + Long shopId = StpKit.USER.getShopId(0L); param.setShopId(shopId); - PageInfo pageInfo = new PageInfo<>(super.mapper.findCreditBuyerList(param)); - return PageUtil.convert(pageInfo); + QueryWrapper queryWrapper = query().eq(CreditBuyer::getShopId, shopId) + .like(CreditBuyer::getMobile, param.getMobile()) + .like(CreditBuyer::getDebtor, param.getDebtor()) + .eq(CreditBuyer::getIsDel, SystemConstants.OneZero.ZERO); + if (param.getRepaymentStatus() != null) { + if (param.getRepaymentStatus() == 1) { + queryWrapper.where(CreditBuyer::getAccountBalance).gt(CreditBuyer::getCreditAmount); + }else { + queryWrapper.where(CreditBuyer::getAccountBalance).le(CreditBuyer::getCreditAmount); + } + } + return page(PageUtil.buildPage(), queryWrapper); } private void commonVerify(CreditBuyer dto) { @@ -201,7 +207,7 @@ public class CreditBuyerServiceImpl extends ServiceImpl orderList = list.stream().sorted(Comparator.comparing(CreditBuyerOrderDTO::getOrderId)).collect(Collectors.toList()); + List orderList = list.stream().sorted(Comparator.comparing(CreditBuyerOrderDTO::getOrderId)).toList(); for (CreditBuyerOrderDTO item : orderList) { // 未付款金额 BigDecimal unpaidAmount = item.getUnpaidAmount(); diff --git a/cash-service/order-service/src/main/resources/mapper/CreditBuyerMapper.xml b/cash-service/order-service/src/main/resources/mapper/CreditBuyerMapper.xml index 4487969d1..6283a6648 100644 --- a/cash-service/order-service/src/main/resources/mapper/CreditBuyerMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/CreditBuyerMapper.xml @@ -3,74 +3,4 @@ - - (SELECT - tb.credit_buyer_id AS credit_buyer_id, - tb.status AS status, - count( 0 ) AS count - FROM - - tb - GROUP BY tb.credit_buyer_id,tb.status) - - - - (SELECT t1.id AS id, - t1.credit_buyer_id AS credit_buyer_id, - t1.order_id AS order_id, - t2.pay_amount - t2.refund_amount AS pay_amount, - t1.paid_amount AS paid_amount, - (t2.pay_amount - t2.refund_amount) - t1.paid_amount AS unpaid_amount, - t1.status AS status, - t2.create_time AS create_time, - t1.last_payment_time AS last_payment_time, - t1.last_payment_method AS last_payment_method, - t1.remark AS remark - FROM tb_credit_buyer_order t1 - LEFT JOIN tb_order_info t2 ON t1.order_id = t2.id) - - - - \ No newline at end of file