Просмотр исходного кода

//..circle

release_toaliyun_real
xhxu 2 лет назад
Родитель
Сommit
98ece84b2e
3 измененных файлов: 51 добавлений и 2 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java
  2. +25
    -0
      mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml
  3. +24
    -0
      mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml

+ 2
- 2
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<AliBusinessCircleOrder> page = aliBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize);
PageInfo<AliBusinessCircleOrder> 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<AlipayOrWxStatistics> page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize);
PageInfo<AlipayOrWxStatistics> page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize);
return new ResultData(page);
}



+ 25
- 0
mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml Просмотреть файл

@@ -241,12 +241,19 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != startTime ">
and `time_end` &gt;= #{startTime}
</if>
<if test=" null != endTime">
and `time_end` &lt; #{endTime}
</if>
<if test=" null != merchantIds and merchantIds.size > 0 ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>

GROUP BY merchant_id
order by payAmount desc
</select>
@@ -263,6 +270,12 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != startTime ">
and `time_end` &gt;= #{startTime}
</if>
<if test=" null != endTime">
and `time_end` &lt; #{endTime}
</if>
<if test=" null != merchantIds and merchantIds.size > 0 ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")">
@@ -285,6 +298,12 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != startTime ">
and `time_end` &gt;= #{startTime}
</if>
<if test=" null != endTime">
and `time_end` &lt; #{endTime}
</if>
<if test=" null != merchantIds and merchantIds.size > 0 ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")">
@@ -305,6 +324,12 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != startTime ">
and `time_end` &gt;= #{startTime}
</if>
<if test=" null != endTime">
and `time_end` &lt; #{endTime}
</if>
<if test=" null != merchantIds and merchantIds.size > 0 ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")">


+ 24
- 0
mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml Просмотреть файл

@@ -273,6 +273,12 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != startTime ">
and `time_end` &gt;= #{startTime}
</if>
<if test=" null != endTime">
and `time_end` &lt; #{endTime}
</if>
<if test=" null != merchantIds and merchantIds.size > 0 ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")">
@@ -295,6 +301,12 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != startTime ">
and `time_end` &gt;= #{startTime}
</if>
<if test=" null != endTime">
and `time_end` &lt; #{endTime}
</if>
<if test=" null != merchantIds and merchantIds.size > 0 ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")">
@@ -316,6 +328,12 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != startTime ">
and `time_end` &gt;= #{startTime}
</if>
<if test=" null != endTime">
and `time_end` &lt; #{endTime}
</if>
<if test=" null != merchantIds and merchantIds.size > 0 ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")">
@@ -336,6 +354,12 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != startTime ">
and `time_end` &gt;= #{startTime}
</if>
<if test=" null != endTime">
and `time_end` &lt; #{endTime}
</if>
<if test=" null != merchantIds and merchantIds.size > 0 ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="id" open="(" separator="," close=")">


Загрузка…
Отмена
Сохранить