diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index 80cb6bc86..c9636699d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -51,9 +51,7 @@ public class WxCouponOrderController extends BaseController { @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 list(@ModelAttribute WxCouponOrderBVo wxCouponOrder, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxCouponOrderController::list"); if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); wxCouponOrder.updateTenantInfo(getTenantInfo()); if (wxCouponOrder.getMerchantName() != null && @@ -62,6 +60,24 @@ public class WxCouponOrderController extends BaseController { } return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); } + + @TenantIgnore + @ApiOperation("子商场查询集团券核销分页列表接口") + @GetMapping("groupList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData groupList(@ModelAttribute WxCouponOrderBVo wxCouponOrder, Integer pageNum, Integer pageSize) { + if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); + TenantEntity mallTenantEntity = getTenantInfo(); + wxCouponOrder.setTenantId(mallTenantEntity.getParentTenantId()); + if (wxCouponOrder.getMerchantName() != null && + wxCouponOrder.getMerchantName().isEmpty()) { + wxCouponOrder.setMerchantName(null); + } + wxCouponOrder.setBTenantId(mallTenantEntity.getTenantId()); + return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); + } @ApiOperation(value = "卡券详情接口") @GetMapping("detail") @@ -127,5 +143,21 @@ public class WxCouponOrderController extends BaseController { } wxCouponOrderService.exportData(false,wxCouponOrder, request, response); } + + @TenantIgnore + @GetMapping("exportGroupData") + @SystemControllerLog(description = "券订单数据-导出数据") + public void exportGroupData(@ModelAttribute WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxCouponOrderController::exportData"); + if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); + TenantEntity mallTenantEntity = getTenantInfo(); + wxCouponOrder.setTenantId(mallTenantEntity.getParentTenantId()); + if (wxCouponOrder.getMerchantName() != null && + wxCouponOrder.getMerchantName().isEmpty()) { + wxCouponOrder.setMerchantName(null); + } + wxCouponOrder.setBTenantId(mallTenantEntity.getTenantId()); + wxCouponOrderService.exportData(false,wxCouponOrder, request, response); + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java index 63d4aa213..70a437206 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java @@ -2,9 +2,11 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; +import com.iformall.annotation.TenantIgnore; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxProfitSharingOrderQueryVo; import com.iformall.domain.vo.WxProfitSharingOrderVo; import com.iformall.service.WxProfitSharingOrderService; @@ -41,7 +43,6 @@ public class WxProfitSharingOrderController extends BaseController { @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 list(@ModelAttribute WxProfitSharingOrderQueryVo order, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::list"); if (null == order) { @@ -51,6 +52,24 @@ public class WxProfitSharingOrderController extends BaseController { return new ResultData(page); } + @TenantIgnore + @ApiOperation("子广场集团券核销分页列表接口") + @GetMapping("groupList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData groupList(@ModelAttribute WxProfitSharingOrderQueryVo order, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::list"); + if (null == order) { + order = new WxProfitSharingOrderQueryVo(); + } + TenantEntity mallTenantEntity = getTenantInfo(); + order.setTenantId(mallTenantEntity.getParentTenantId()); + order.setBTenantId(mallTenantEntity.getTenantId()); + final PageInfo page = wxProfitSharingOrderService.listAsPage(order, pageNum, pageSize); + return new ResultData(page); + } + @ApiOperation("记录导出") @GetMapping("/exportData") @@ -62,6 +81,19 @@ public class WxProfitSharingOrderController extends BaseController { wxProfitSharingOrderService.exportData(order, request, response); } + @ApiOperation("记录导出") + @GetMapping("/exportGroupData") + @SystemControllerLog(description = "线上自动分账记录-导出") + public void exportGroupData(@ModelAttribute WxProfitSharingOrderQueryVo order, HttpServletRequest request, HttpServletResponse response) { + if (null == order) { + order = new WxProfitSharingOrderQueryVo(); + } + TenantEntity mallTenantEntity = getTenantInfo(); + order.setTenantId(mallTenantEntity.getParentTenantId()); + order.setBTenantId(mallTenantEntity.getTenantId()); + wxProfitSharingOrderService.exportData(order, request, response); + } + @ApiOperation("交易统计") @GetMapping("/queryOrderSummary") @SystemControllerLog(description = "分账订单-交易统计") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index f335151ac..76edc599f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -117,6 +117,9 @@ public class WxCouponOrderBVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value="1:A端发卷,2:B端发卷",name="sourceType") private Integer sourceType; + + @io.swagger.annotations.ApiModelProperty(value = "b端核销商场tenantId", name = "bTenantId") + private String bTenantId; public String getbUserName() { return bUserName; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java index 1ac4c5c93..f4da81be9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java @@ -45,6 +45,9 @@ public class WxProfitSharingOrderQueryVo extends TenantEntity { @TableField(exist = false) private Integer limit; + + @TableField(exist = false) + private String bTenantId; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 37b45c41a..7ecb7ed33 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -404,7 +404,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List mallList = wxMallMapper.findList(wxMallq); if ( null != mallList && mallList.size() > 0 ) { for (WxMall mall : mallList) { - mallTenantIdList.add(mall.getTenantId()); + if (!mallTenantIdList.contains(mall.getTenantId())) { + mallTenantIdList.add(mall.getTenantId()); + } } } for (int j = 0 ; j < couponOrderList.size(); j ++) { @@ -937,7 +939,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List mallList = wxMallMapper.findList(wxMallq); if ( null != mallList && mallList.size() > 0 ) { for (WxMall mall : mallList) { - mallTenantIdList.add(mall.getTenantId()); + if (!mallTenantIdList.contains(mall.getTenantId())) { + mallTenantIdList.add(mall.getTenantId()); + } } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 87c919bb5..1e7ffa831 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -787,6 +787,10 @@ AND co.update_date < #{verifyEndDate,jdbcType=TIMESTAMP} + + AND co.b_tenant_id = #{bTenantId} + + and co.coupon_id in diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index 1ae142fb5..d31c1de24 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -204,6 +204,9 @@ and pso.type = #{type} + + and pso.`b_tenant_id` = #{bTenantId} +