From 2d279e136ed473cd872ef068a02bc188036e66f0 Mon Sep 17 00:00:00 2001 From: zhaohengkun Date: Fri, 27 Sep 2024 11:11:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AllOrderInfoController.java | 11 ++--- .../order/mapper/AllOrderInfoMapper.java | 3 +- .../order/mapper/xml/AllOrderInfoMapper.xml | 42 +++++++++++-------- .../service/impl/AllOrderInfoServiceImpl.java | 14 ++++--- 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java index d6892166b..14bf2ef4d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java @@ -253,8 +253,8 @@ public class AllOrderInfoController extends BaseController { return getSuccessResult(allOrderInfoService.getAmount1(allOrderInfo)); } - - @GetMapping("getFenxiByDaili") + // 支付通道分析 下面列表数据 + @GetMapping("/getFenxiByDaili") public ResponseObject getFenxiByDaili(AllOrderInfo allOrderInfo, @RequestParam(value = "page",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ @@ -262,8 +262,8 @@ public class AllOrderInfoController extends BaseController { IPage list = allOrderInfoService.getFenxiByDaili(page, allOrderInfo); return getSuccessResult(list); } - - @GetMapping("getFenxiByDailiType") +// 获取 支付方式 下面列表数据 + @GetMapping("/getFenxiByDailiType") public ResponseObject getFenxiByDailiType(AllOrderInfo allOrderInfo, @RequestParam(value = "page",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ @@ -271,11 +271,12 @@ public class AllOrderInfoController extends BaseController { IPage list = allOrderInfoService.getFenxiByDailiType(page, allOrderInfo); return getSuccessResult(list); } - +// 获取 支付方式 上面统计数据 @GetMapping("/getFenxiByDailiTypeBydata") public ResponseObject getFenxiByDailiTypeBydata(AllOrderInfoVo allOrderInfo){ return getSuccessResult(allOrderInfoService.getFenxiByDailiTypeBydata(allOrderInfo)); } +// 支付通道分析 上面 统计数据 @GetMapping("/getFenxiByDailiBydata") public ResponseObject getFenxiByDailiBydata(AllOrderInfoVo allOrderInfo){ return getSuccessResult(allOrderInfoService.getFenxiByDailiBydata(allOrderInfo)); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java index c66b6b1fc..a743c4d38 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java @@ -19,6 +19,7 @@ import com.fuint.business.userManager.vo.UserBalanceVo; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -90,7 +91,7 @@ public interface AllOrderInfoMapper extends BaseMapper { String getCardGift(@Param("order") UserBalanceVo record); - AllOrderInfoVo getPaymentChannelData(Integer storeId); + AllOrderInfoVo getPaymentChannelData(@Param("order")Map map); IPage runningWaterByInstituion2(Page page,@Param("order") AllOrderInfoDto allOrderInfo); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml index cc53c1a20..287100326 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml @@ -516,13 +516,13 @@ SELECT -- 总消费 COALESCE(SUM(CASE WHEN type NOT IN (3, 5) AND ref_by IS NULL THEN pay_money ELSE 0 END), 0) AS s1, - COUNT(CASE WHEN type NOT IN (3, 5) AND ref_by IS NULL THEN pay_money ELSE 0 END) AS s1c, + COUNT(CASE WHEN type NOT IN (3, 5) AND ref_by IS NULL THEN pay_money ELSE 0 END) AS s1c, -- 总充值 - COALESCE(SUM(CASE WHEN type = 3 AND ref_by IS NULL THEN pay_money ELSE 0 END), 0) AS s2, - COUNT(CASE WHEN type = 3 AND ref_by IS NULL THEN pay_money ELSE 0 END) AS s2c, + COALESCE(SUM(CASE WHEN type = 3 AND ref_by IS NULL THEN pay_money ELSE 0 END), 0) AS s2, + COUNT(CASE WHEN type = 3 AND ref_by IS NULL THEN pay_money ELSE 0 END) AS s2c, -- 退款总金额 次数 - COALESCE(SUM(CASE WHEN ref_by IS NOT NULL THEN ref_money ELSE 0 END), 0) AS s3, - COUNT(CASE WHEN ref_by IS NOT NULL THEN ref_money ELSE 0 END) AS s3c + COALESCE(SUM(CASE WHEN ref_by IS NOT NULL THEN ref_money ELSE 0 END), 0) AS s3, + COUNT(CASE WHEN ref_by IS NOT NULL THEN ref_money ELSE 0 END) AS s3c FROM all_order_info where user_id = #{order.mtUserId} @@ -538,7 +538,7 @@ SUM(CASE WHEN all_order_info.type = 3 AND all_order_info.ref_by IS NULL THEN all_order_info.pay_money ELSE 0 END) AS tongjMoney FROM all_order_info - INNER JOIN ( + INNER JOIN ( SELECT mt_user.* FROM mt_user_balance LEFT JOIN mt_user ON mt_user_balance.mt_user_id = mt_user.id @@ -553,8 +553,8 @@