| @@ -52,7 +52,7 @@ public class AliBusinessCircleOrderController extends BaseController { | |||||
| } | } | ||||
| circleOrder.updateTenantInfo(getTenantInfo()); | circleOrder.updateTenantInfo(getTenantInfo()); | ||||
| circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<AliBusinessCircleOrder> page = aliBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); | |||||
| PageInfo<AliBusinessCircleOrder> page = aliBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); | |||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -123,7 +123,7 @@ public class AliBusinessCircleOrderController extends BaseController { | |||||
| circleOrder = new AliBusinessCircleOrder(); | circleOrder = new AliBusinessCircleOrder(); | ||||
| } | } | ||||
| circleOrder.updateTenantInfo(getTenantInfo()); | circleOrder.updateTenantInfo(getTenantInfo()); | ||||
| final PageInfo<AlipayOrWxStatistics> page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); | |||||
| PageInfo<AlipayOrWxStatistics> page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); | |||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -241,12 +241,19 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != startTime "> | |||||
| and `time_end` >= #{startTime} | |||||
| </if> | |||||
| <if test=" null != endTime"> | |||||
| and `time_end` < #{endTime} | |||||
| </if> | |||||
| <if test=" null != merchantIds and merchantIds.size > 0 "> | <if test=" null != merchantIds and merchantIds.size > 0 "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | ||||
| #{id} | #{id} | ||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| GROUP BY merchant_id | GROUP BY merchant_id | ||||
| order by payAmount desc | order by payAmount desc | ||||
| </select> | </select> | ||||
| @@ -263,6 +270,12 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != startTime "> | |||||
| and `time_end` >= #{startTime} | |||||
| </if> | |||||
| <if test=" null != endTime"> | |||||
| and `time_end` < #{endTime} | |||||
| </if> | |||||
| <if test=" null != merchantIds and merchantIds.size > 0 "> | <if test=" null != merchantIds and merchantIds.size > 0 "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | ||||
| @@ -285,6 +298,12 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != startTime "> | |||||
| and `time_end` >= #{startTime} | |||||
| </if> | |||||
| <if test=" null != endTime"> | |||||
| and `time_end` < #{endTime} | |||||
| </if> | |||||
| <if test=" null != merchantIds and merchantIds.size > 0 "> | <if test=" null != merchantIds and merchantIds.size > 0 "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | ||||
| @@ -305,6 +324,12 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != startTime "> | |||||
| and `time_end` >= #{startTime} | |||||
| </if> | |||||
| <if test=" null != endTime"> | |||||
| and `time_end` < #{endTime} | |||||
| </if> | |||||
| <if test=" null != merchantIds and merchantIds.size > 0 "> | <if test=" null != merchantIds and merchantIds.size > 0 "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | ||||
| @@ -273,6 +273,12 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != startTime "> | |||||
| and `time_end` >= #{startTime} | |||||
| </if> | |||||
| <if test=" null != endTime"> | |||||
| and `time_end` < #{endTime} | |||||
| </if> | |||||
| <if test=" null != merchantIds and merchantIds.size > 0 "> | <if test=" null != merchantIds and merchantIds.size > 0 "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | ||||
| @@ -295,6 +301,12 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != startTime "> | |||||
| and `time_end` >= #{startTime} | |||||
| </if> | |||||
| <if test=" null != endTime"> | |||||
| and `time_end` < #{endTime} | |||||
| </if> | |||||
| <if test=" null != merchantIds and merchantIds.size > 0 "> | <if test=" null != merchantIds and merchantIds.size > 0 "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | ||||
| @@ -316,6 +328,12 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != startTime "> | |||||
| and `time_end` >= #{startTime} | |||||
| </if> | |||||
| <if test=" null != endTime"> | |||||
| and `time_end` < #{endTime} | |||||
| </if> | |||||
| <if test=" null != merchantIds and merchantIds.size > 0 "> | <if test=" null != merchantIds and merchantIds.size > 0 "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | ||||
| @@ -336,6 +354,12 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != startTime "> | |||||
| and `time_end` >= #{startTime} | |||||
| </if> | |||||
| <if test=" null != endTime"> | |||||
| and `time_end` < #{endTime} | |||||
| </if> | |||||
| <if test=" null != merchantIds and merchantIds.size > 0 "> | <if test=" null != merchantIds and merchantIds.size > 0 "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")"> | ||||