From 94a129fde06269c7ab5bc0c6d6e3e099907cab2b Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jul 2023 14:18:43 +0800 Subject: [PATCH] //..merchant --- .../controller/market/AliBusinessCircleOrderController.java | 4 +--- .../controller/market/WxBusinessCircleOrderController.java | 4 +--- .../service/impl/AliBusinessCircleOrderServiceImpl.java | 3 +++ .../service/impl/WxBusinessCircleOrderServiceImpl.java | 3 +++ .../main/resources/mapper/AliBusinessCircleOrderMapper.xml | 5 +++-- .../main/resources/mapper/WxBusinessCircleOrderMapper.xml | 5 +++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index 8152a0a24..738268f1d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -122,9 +122,7 @@ public class AliBusinessCircleOrderController extends BaseController { if (null == circleOrder) { circleOrder = new AliBusinessCircleOrder(); } -// circleOrder.updateTenantInfo(getTenantInfo()); - circleOrder.setTenantId("789"); - circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); + circleOrder.updateTenantInfo(getTenantInfo()); final PageInfo page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index 28a58b8b5..e2fa3a37d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -118,9 +118,7 @@ public class WxBusinessCircleOrderController extends BaseController { if (null == circleOrder) { circleOrder = new WxBusinessCircleOrder(); } -// circleOrder.updateTenantInfo(getTenantInfo()); - circleOrder.setTenantId("789"); - circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); + circleOrder.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 5e6ed6215..9a06d106d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -389,6 +389,9 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); if (!CollectionUtils.isEmpty(ids)) { record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 414e1953f..67ea2bc5b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -564,6 +564,9 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); if (!CollectionUtils.isEmpty(ids)) { record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); } } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 3730f5da7..7f5d0d2e6 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -229,7 +229,7 @@ and is_refund = 1 - SELECT SUM(pay_amount) as 'payAmount', SUM(refund_amount) as 'refundAmount', merchant_id as 'merchantId', @@ -241,7 +241,8 @@ #{id} - GROUP BY merchant_id,is_refund; + GROUP BY merchant_id,is_refund + order by payAmount desc; diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 1da93e040..d17f8e0fa 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -261,7 +261,7 @@ and is_refund = 1 - SELECT SUM(pay_amount) as 'payAmount', SUM(refund_amount) as 'refundAmount', merchant_id as 'merchantId', @@ -273,6 +273,7 @@ #{id} - GROUP BY merchant_id,is_refund; + GROUP BY merchant_id,is_refund + order by payAmount desc; \ No newline at end of file