From c3721db21428fc1e64b9c69830c2d796ef05d90f Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 10 Apr 2025 21:07:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=95=86=E5=AE=B6=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/order/HardOrderTotalServiceImpl.java | 4 +- .../mapper/order/HardOrderMapper.xml | 1 + .../thirdparty/vo/ks/KsBarcodeLikeVo.java | 2 +- .../thirdparty/vo/ks/KsBaseInnerVo.java | 14 ++ .../pjcloud/thirdparty/vo/ks/KsBaseVo.java | 25 +++ .../controller/ks/ThirdKsApiController.java | 2 +- .../thirdparty/service/ThirdKsApiService.java | 2 +- .../impl/ks/ThirdKsApiServiceImpl.java | 196 ++++++++++++++++-- .../thirdparty/utils/ks/api/KsApi.java | 2 +- 9 files changed, 225 insertions(+), 23 deletions(-) create mode 100644 pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsBaseInnerVo.java create mode 100644 pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsBaseVo.java diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java index 361897c8a..b2dc7a8cd 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java @@ -217,14 +217,14 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { for (HardOrderCsVo v : totalList) { // 退款 if (ObjectUtil.isNotEmpty(refundList)) { - refundList.stream().filter(i -> ObjectUtil.equals(i.getMerchantId(), v.getMerchantId())).findFirst().ifPresent(i -> { + refundList.stream().filter(i -> ObjectUtil.equals(i.getDay(), v.getDay()) && ObjectUtil.equals(i.getMerchantId(), v.getMerchantId())).findFirst().ifPresent(i -> { v.setTotalRefundPrice(i.getTotalPayPrice()); v.setTotalRefundCount(i.getTotalPayCount()); }); } // 盈利 if (ObjectUtil.isNotEmpty(profitList)) { - profitList.stream().filter(i -> ObjectUtil.equals(i.getMerchantId(), v.getMerchantId())).findFirst().ifPresent(i -> { + profitList.stream().filter(i -> ObjectUtil.equals(i.getDay(), v.getDay()) && ObjectUtil.equals(i.getMerchantId(), v.getMerchantId())).findFirst().ifPresent(i -> { v.setTotalProfitPrice(i.getTotalPayPrice()); v.setTotalProfitCount(i.getTotalPayCount()); }); diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index 27f6c9352..4249756ce 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -252,6 +252,7 @@ group by DATE_FORMAT(a.create_time, '%Y-%m-%d') + order by DATE_FORMAT(a.create_time, '%Y-%m-%d') desc, a.merchant_id desc