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

//..circle

release_toaliyun_real
xhxu 2 лет назад
Родитель
Сommit
653a93a14d
10 измененных файлов: 168 добавлений и 1 удалений
  1. +15
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java
  2. +15
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java
  6. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java
  7. +21
    -0
      mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java
  8. +21
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java
  9. +41
    -0
      mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml
  10. +41
    -1
      mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml

+ 15
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java Просмотреть файл

@@ -127,4 +127,19 @@ public class AliBusinessCircleOrderController extends BaseController {
return new ResultData(page);
}

@ApiOperation("统计接口2")
@GetMapping("aliStatistics")
@ApiImplicitParams({
})
@SystemControllerLog(description = "-统计")
public ResultData aliStatistics(@ModelAttribute AliBusinessCircleOrder circleOrder) {
logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::aliStatistics");
if (null == circleOrder) {
circleOrder = new AliBusinessCircleOrder();
}
circleOrder.updateTenantInfo(getTenantInfo());
AlipayOrWxStatistics aliStatistics = aliBusinessCircleOrderService.aliStatistics(circleOrder);
return new ResultData(aliStatistics);
}

}

+ 15
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java Просмотреть файл

@@ -123,4 +123,19 @@ public class WxBusinessCircleOrderController extends BaseController {
return new ResultData(page);
}

@ApiOperation("统计接口2")
@GetMapping("wxStatistics")
@ApiImplicitParams({
})
@SystemControllerLog(description = "-统计")
public ResultData wxStatistics(@ModelAttribute WxBusinessCircleOrder circleOrder) {
logger.debug("[" + getIpAddr() + "] WxBusinessCircleOrderController::wxPayList");
if (null == circleOrder) {
circleOrder = new WxBusinessCircleOrder();
}
circleOrder.updateTenantInfo(getTenantInfo());
AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderService.aliStatistics(circleOrder);
return new ResultData(aliStatistics);
}

}

+ 4
- 0
mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java Просмотреть файл

@@ -53,4 +53,8 @@ public interface AliBusinessCircleOrderMapper extends CommonMapper<AliBusinessCi

List<AlipayOrWxStatistics> aliRefundList(AliBusinessCircleOrder record);

AlipayOrWxStatistics aliPayStatistics(AliBusinessCircleOrder record);

AlipayOrWxStatistics aliRefundStatistics(AliBusinessCircleOrder record);

}

+ 5
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.mapper;

import com.iformall.common.CommonMapper;
import com.iformall.domain.po.AliBusinessCircleOrder;
import com.iformall.domain.po.BusinessCircleBase;
import com.iformall.domain.po.WxBusinessCircleOrder;
import com.iformall.domain.vo.AlipayOrWxStatistics;
@@ -54,4 +55,8 @@ public interface WxBusinessCircleOrderMapper extends CommonMapper<WxBusinessCirc

List<AlipayOrWxStatistics> wxRefundList(WxBusinessCircleOrder record);

AlipayOrWxStatistics aliPayStatistics(WxBusinessCircleOrder record);

AlipayOrWxStatistics aliRefundStatistics(WxBusinessCircleOrder record);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java Просмотреть файл

@@ -60,4 +60,6 @@ public interface AliBusinessCircleOrderService {
Integer sumCircleRefundAmount(BusinessCircleBase circleOrder);

PageInfo<AlipayOrWxStatistics> aliPayList(AliBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize);

AlipayOrWxStatistics aliStatistics(AliBusinessCircleOrder circleOrder);
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.service;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.po.AliBusinessCircleOrder;
import com.iformall.domain.po.BusinessCircleBase;
import com.iformall.domain.po.WxBusinessCircleOrder;
import com.iformall.domain.po.base.TenantEntity;
@@ -92,4 +93,6 @@ public interface WxBusinessCircleOrderService {

PageInfo<AlipayOrWxStatistics> wxPayList(WxBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize);

AlipayOrWxStatistics aliStatistics(WxBusinessCircleOrder circleOrder);

}

+ 21
- 0
mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java Просмотреть файл

@@ -424,4 +424,25 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder
}
return pageInfo;
}

@Override
public AlipayOrWxStatistics aliStatistics(AliBusinessCircleOrder record) {
if (StringUtils.isNotEmpty(record.getMerchantName())) {
List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName());
if (!CollectionUtils.isEmpty(ids)) {
record.setMerchantIds(ids);
}else{
ids.add(-999l);
record.setMerchantIds(ids);
}
}
AlipayOrWxStatistics aliStatistics = aliBusinessCircleOrderMapper.aliPayStatistics(record);
if(aliStatistics.getPayAmount() > 0){
AlipayOrWxStatistics aliRefundStatistics = aliBusinessCircleOrderMapper.aliRefundStatistics(record);
aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount());
aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints());
}

return aliStatistics;
}
}

+ 21
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java Просмотреть файл

@@ -600,5 +600,26 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
return pageInfo;
}

@Override
public AlipayOrWxStatistics aliStatistics(WxBusinessCircleOrder record) {
if (StringUtils.isNotEmpty(record.getMerchantName())) {
List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName());
if (!CollectionUtils.isEmpty(ids)) {
record.setMerchantIds(ids);
}else{
ids.add(-999l);
record.setMerchantIds(ids);
}
}
AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderMapper.aliPayStatistics(record);
if(aliStatistics.getPayAmount() > 0){
AlipayOrWxStatistics aliRefundStatistics = wxBusinessCircleOrderMapper.aliRefundStatistics(record);
aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount());
aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints());
}

return aliStatistics;
}


}

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

@@ -272,4 +272,45 @@
GROUP BY merchant_id
</select>


<select id="aliPayStatistics" parameterType="com.iformall.domain.po.AliBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
SELECT
IFNULL(SUM(`pay_amount`),0) as 'payAmount',
IFNULL(SUM(`increased_points`),0) as 'payPoints'
FROM ali_business_circle_order
where is_refund = 0
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</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>
</select>

<select id="aliRefundStatistics" parameterType="com.iformall.domain.po.AliBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
SELECT
IFNULL(SUM(`refund_amount`),0) as 'refundAmount',
IFNULL(SUM(`increased_points`),0) as 'refundPoints'
FROM ali_business_circle_order
where is_refund = 1
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</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>
</select>

</mapper>

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

@@ -283,7 +283,7 @@
order by payAmount desc;
</select>

<select id="aliRefundList" parameterType="com.iformall.domain.po.AliBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
<select id="wxRefundList" parameterType="com.iformall.domain.po.AliBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
SELECT merchant_id as 'merchantId',
IFNULL(SUM(`refund_amount`),0) as 'refundAmount',
IFNULL(SUM(`increased_points`),0) as 'refundPoints'
@@ -304,4 +304,44 @@
GROUP BY merchant_id
</select>

<select id="wxPayStatistics" parameterType="com.iformall.domain.po.AliBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
SELECT
IFNULL(SUM(`pay_amount`),0) as 'payAmount',
IFNULL(SUM(`increased_points`),0) as 'payPoints'
FROM ali_business_circle_order
where is_refund = 0
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</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>
</select>

<select id="wxRefundStatistics" parameterType="com.iformall.domain.po.AliBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
SELECT
IFNULL(SUM(`refund_amount`),0) as 'refundAmount',
IFNULL(SUM(`increased_points`),0) as 'refundPoints'
FROM ali_business_circle_order
where is_refund = 1
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</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>
</select>

</mapper>

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