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 c2b6919f7..b18bb0579 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -52,7 +52,7 @@ public class AliBusinessCircleOrderController extends BaseController { } circleOrder.updateTenantInfo(getTenantInfo()); circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); - final PageInfo page = aliBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); + PageInfo page = aliBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); return new ResultData(page); } @@ -123,7 +123,7 @@ public class AliBusinessCircleOrderController extends BaseController { circleOrder = new AliBusinessCircleOrder(); } circleOrder.updateTenantInfo(getTenantInfo()); - final PageInfo page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); + PageInfo page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 8b41c3749..1a1736abb 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -241,12 +241,19 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in #{id} + GROUP BY merchant_id order by payAmount desc @@ -263,6 +270,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -285,6 +298,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -305,6 +324,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 4d3ec570e..1718a67c4 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -273,6 +273,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -295,6 +301,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -316,6 +328,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -336,6 +354,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in