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 fcf1396ee..cf9b22e36 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Map; @RestController @RequestMapping("aliCircle") @@ -53,6 +55,27 @@ public class AliBusinessCircleOrderController extends BaseController { return new ResultData(page); } + @ApiOperation("统计接口") + @GetMapping("statistics") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + @SystemControllerLog(description = "-统计") + public ResultData statistics(@ModelAttribute AliBusinessCircleOrder circleOrder) { + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::statistics"); + if (null == circleOrder) { + circleOrder = new AliBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + Integer sumPayAmount = aliBusinessCircleOrderService.sumCirclePayment(circleOrder); + Integer sumRefundAmount = aliBusinessCircleOrderService.sumCircleRefundAmount(circleOrder); + Map resultMap = new HashMap(); + resultMap.put("sumPayAmount",sumPayAmount); + resultMap.put("sumRefundAmount",sumRefundAmount); + return new ResultData(resultMap); + } + @ApiOperation("详情接口") @GetMapping("detail") @ApiImplicitParams({ 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 f422276ed..6e2f38578 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Map; @RestController @RequestMapping("wxCircle") @@ -49,6 +51,27 @@ public class WxBusinessCircleOrderController extends BaseController { return new ResultData(page); } + @ApiOperation("统计接口") + @GetMapping("statistics") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + @SystemControllerLog(description = "-统计") + public ResultData statistics(@ModelAttribute WxBusinessCircleOrder circleOrder) { + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::statistics"); + if (null == circleOrder) { + circleOrder = new WxBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + Integer sumPayAmount = wxBusinessCircleOrderService.sumCirclePayment(circleOrder); + Integer sumRefundAmount = wxBusinessCircleOrderService.sumCircleRefundAmount(circleOrder); + Map resultMap = new HashMap(); + resultMap.put("sumPayAmount",sumPayAmount); + resultMap.put("sumRefundAmount",sumRefundAmount); + return new ResultData(resultMap); + } + @ApiOperation("详情接口") @GetMapping("detail") @ApiImplicitParams({ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java index 30a96009d..d13a17908 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java @@ -5,7 +5,6 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.WxThirdPartyOrders; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumThirdOrderType; @@ -26,6 +25,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Map; @RestController @RequestMapping("thirdCircle") @@ -54,6 +55,27 @@ public class WxThirdPartyOrdersController extends BaseController { return new ResultData(page); } + @ApiOperation("统计接口") + @GetMapping("statistics") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + @SystemControllerLog(description = "-统计") + public ResultData statistics(@ModelAttribute WxThirdPartyOrders circleOrder) { + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::statistics"); + if (null == circleOrder) { + circleOrder = new WxThirdPartyOrders(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + Integer sumPayAmount = wxThirdPartyOrdersOrderService.sumCirclePayment(circleOrder); + Integer sumRefundAmount = wxThirdPartyOrdersOrderService.sumCircleRefundAmount(circleOrder); + Map resultMap = new HashMap(); + resultMap.put("sumPayAmount",sumPayAmount); + resultMap.put("sumRefundAmount",sumRefundAmount); + return new ResultData(resultMap); + } + @ApiOperation("详情接口") @GetMapping("detail") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java index e956a49c1..c28c1064a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java @@ -45,4 +45,6 @@ public interface AliBusinessCircleOrderMapper extends CommonMapper list = wxThirdPartyOrdersMapper.findListVo(circleOrder); excelService.exportExcel(list, null, "第三方积分抵扣", WxThirdPartyOrdersVo.class, "第三方积分抵扣.xlsx", response, false); } + + @Override + public Integer sumCirclePayment(BusinessCircleBase circleOrder) { + Integer sumCirclePayment = wxThirdPartyOrdersMapper.sumCirclePayment(circleOrder); + return sumCirclePayment==null?0:sumCirclePayment; + } + + @Override + public Integer sumCircleRefundAmount(BusinessCircleBase circleOrder) { + Integer sumCircleRefundAmount = wxThirdPartyOrdersMapper.sumCircleRefundAmount(circleOrder); + return sumCircleRefundAmount==null?0:sumCircleRefundAmount; + } } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index e5755c273..1e0fcf8a4 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -127,7 +127,7 @@ #{idItem} - order by ${sortColumns} + + + diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 3b417b09c..3fe1cc89d 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -148,7 +148,7 @@ #{idItem} - order by ${sortColumns} + select IFNULL(SUM(`pay_amount`),0) as sum_pay_amount from wx_business_circle_order - where 1=1 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - - and `merchant_id` = #{merchantId} - - - and `time_end` >= #{startTime} - - - and `time_end` < #{endTime} - + + and is_refund = 0 + + + diff --git a/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml b/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml index 70e8e061c..9e10e89b2 100644 --- a/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml @@ -147,7 +147,7 @@ #{idItem} - order by ${sortColumns} + + select + IFNULL(SUM(`pay_amount`),0) as sum_pay_amount + from wx_third_party_orders + + and is_refund = 0 + + + +