From d362e8e2c9fdd2494a37d2df295f33a3460242d8 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sun, 14 Sep 2025 22:53:02 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=20=E5=AE=A2=E6=88=B7=E9=94=80=E5=94=AE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=B0=83=E4=BC=98=EF=BC=8C=E6=A1=A3=E5=8F=A3=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=97=B6=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E7=8E=B0?= =?UTF-8?q?=E9=87=91=E5=AE=A2=E6=88=B7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/store/StoreIndexCusSaleTop10ResVO.java | 2 ++ .../java/com/ruoyi/common/constant/Constants.java | 3 ++- .../mapper/quartz/DailySaleCustomerMapper.xml | 7 ++++++- .../xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java | 2 ++ .../xkt/service/impl/StoreCertificateServiceImpl.java | 11 +++++++---- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexCusSaleTop10ResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexCusSaleTop10ResVO.java index 177838206..c2cb0bd21 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexCusSaleTop10ResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexCusSaleTop10ResVO.java @@ -25,5 +25,7 @@ public class StoreIndexCusSaleTop10ResVO { private Integer saleNum; @ApiModelProperty(value = "累计退货量") private Integer refundNum; + @ApiModelProperty(value = "退货率") + private BigDecimal refundRate; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index d1accb192..26b8bd775 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -257,7 +257,8 @@ public class Constants public static final Integer FA_HUO_BAO_SN_PREFIX_LENGTH = 10; // 发货宝条码 公共部分 前缀长度 public static final Integer FA_HUO_BAO_SN_COMMON_PREFIX_LENGTH = 8; - + // 每个档口默认 现金客户 + public static final String STORE_CUS_CASH = "现金客户"; /** diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml index 7586d55ab..cc8931ee8 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml @@ -30,7 +30,12 @@ SUM(IFNULL( dsc.sale_amount, 0 )) AS saleAmount, SUM(IFNULL( dsc.refund_amount, 0 )) AS refundAmount, SUM(IFNULL( dsc.sale_num, 0 )) AS saleNum, - SUM(IFNULL( dsc.refund_num, 0 )) AS refundNum + SUM(IFNULL( dsc.refund_num, 0 )) AS refundNum, + CASE + WHEN SUM(IFNULL( dsc.sale_num, 0 )) = 0 THEN + 0 ELSE ROUND( + SUM(IFNULL( dsc.refund_num, 0 )) * 1.0 / SUM(IFNULL( dsc.sale_num, 0 )) * 100, 2) + END AS refundRate FROM daily_sale_customer dsc JOIN store_customer sc ON dsc.store_cus_id = sc.id diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java index 573cc8c42..4ed13982c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java @@ -23,5 +23,7 @@ public class StoreIndexCusSaleTop10ResDTO { private Integer saleNum; @ApiModelProperty(value = "累计退货量") private Integer refundNum; + @ApiModelProperty(value = "退货率") + private BigDecimal refundRate; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java index 3f457617a..712b405d5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java @@ -11,10 +11,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.xkt.domain.Store; -import com.ruoyi.xkt.domain.StoreCertificate; -import com.ruoyi.xkt.domain.SysFile; -import com.ruoyi.xkt.domain.VoucherSequence; +import com.ruoyi.xkt.domain.*; import com.ruoyi.xkt.dto.storeCertificate.StoreCertDTO; import com.ruoyi.xkt.dto.storeCertificate.StoreCertResDTO; import com.ruoyi.xkt.dto.storeCertificate.StoreCertStepResDTO; @@ -57,6 +54,7 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { final DailySaleProductMapper dailySaleProdMapper; final ISysUserService userService; final VoucherSequenceMapper vsMapper; + final StoreCustomerMapper storeCusMapper; /** * 新增档口认证 @@ -85,6 +83,11 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { // 代发订单 vsList.add(this.initVoucherSequence(store.getId(), Constants.VOUCHER_SEQ_STORE_ORDER_TYPE, Constants.VOUCHER_SEQ_STORE_ORDER_PREFIX)); this.vsMapper.insert(vsList); + // 新增档口 “现金客户” + StoreCustomer storeCus = new StoreCustomer().setStoreId(store.getId()).setPhone(store.getContactPhone()) + // 默认创建现金客户 + .setCusName(Constants.STORE_CUS_CASH).setAddOverPrice(0); + this.storeCusMapper.insert(storeCus); return count; }