From 43ac3e7b239368a3721d187c41c47a1763e43a3e Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 20 Apr 2024 19:45:39 +0800 Subject: [PATCH] fix bug --- .../datatower/WxMerchantTradeDailyController.java | 6 +++++- .../market/WxMerchantMicroPayController.java | 7 ++++++- .../controller/WxRaffleActivityController.java | 1 + .../iformall/domain/dto/PageMerchantMicroPayDTO.java | 3 +++ .../service/impl/MarkingDataReportServiceImpl.java | 8 ++++++++ .../iformall/service/impl/WxMerchantServiceImpl.java | 12 ++++++++---- .../src/main/resources/mapper/WxOrderMapper.xml | 6 ++++++ 7 files changed, 37 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index b7724c632..56c4b5ade 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -64,8 +64,12 @@ public class WxMerchantTradeDailyController extends BaseController { @ApiOperation("数据汇总") @GetMapping("/summary") public ResultData summary(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily) { - logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::summary"); wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); + wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); + } return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index 6f62cb480..959653dcf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.PageMerchantMicroPayDTO; import com.iformall.domain.dto.WxOrderReportDto; +import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.PageMerchantMicroPayVO; import com.iformall.domain.vo.WxMerchantMicroPayVo; @@ -76,8 +77,12 @@ public class WxMerchantMicroPayController extends BaseController { @ApiOperation("商户收银分页查询") @GetMapping("/page") public ResultData pageMerchantMicroPay(PageMerchantMicroPayDTO dto) { - logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::pageMerchantMicroPay"); dto.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + dto.setFloorForRule(dataRule.getFloorIds()); + dto.setBusinessForRule(dataRule.getBussinessIds()); + } PageInfo page = markingDataReportService.pageMerchantMicroPay(dto); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java index ecc5872a9..22ed66aae 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java @@ -160,6 +160,7 @@ public class WxRaffleActivityController extends BaseController { WxRaffleActivityRecord r = new WxRaffleActivityRecord(); r.setActivityId(a.getId()); r.updateTenantInfo(a); + r.setMerchantId(getLoginBUser().getMerchantId()); wxCashBackActivityRecord.setMerchantId(getLoginBUser().getMerchantId()); int allRecordCount = wxCashBackActivityService.getRecordCount(r); diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/PageMerchantMicroPayDTO.java b/mallinkService/src/main/java/com/iformall/domain/dto/PageMerchantMicroPayDTO.java index c764d19f0..b08f1e204 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/PageMerchantMicroPayDTO.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/PageMerchantMicroPayDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +import java.util.List; /** * a端收银记录分页查询DTO @@ -35,4 +36,6 @@ public class PageMerchantMicroPayDTO extends TenantEntity { * 商户id */ private Long merchantId; + private List merchantIds; + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index a860f8585..00bf398b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -626,6 +626,14 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override public PageInfo pageMerchantMicroPay(PageMerchantMicroPayDTO dto) { + if (null != dto.getFloorForRule()) { + List mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0); + if (null == mids || mids.size() <= 0 ) { + dto.setMerchantId(-1L); + }else { + dto.setMerchantIds(mids); + } + } PageInfo pageResult = PageHelper.startPage(dto.getPageNum(), dto.getPageSize()).doSelectPageInfo(() -> wxOrderMapper.listMerchantMicroPay(dto)); Map merchantMap = wxMerchantService.listMerchant(dto, null).stream().collect(Collectors.toMap(ListMerchantVO::getId, Function.identity())); List result = pageResult.getList().stream().map(x -> { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 492f9ebaa..e0c7a3851 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1239,10 +1239,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { merchantIds.addAll(userMerchantIds); } } - String floorRule = StringUtils.trimToNull(record.getFloorForRule()); - Long building = record.getBuilding(); - Long floor = record.getFloor(); - List floorMerchantIds = getFloorBuildMerchantIds(record, floorRule, building, floor, 0, 0); + + List floorMerchantIds = getFloorBuildingMerchantIds(record,record.getFloorForRule(),record.getBuilding(),record.getFloor()); if(floorMerchantIds != null){ if(merchantIds.size() > 0){ merchantIds.retainAll(floorMerchantIds); @@ -1293,6 +1291,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { // } } + private List getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor) { + String floorRule = StringUtils.trimToNull(floorForRule); + List floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor, 0, 0); + return floorMerchantIds; + } + @Override public List getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ) { if (null != floorRule || null != building || null != floor) { diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index c399fe32f..fae72008e 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -1222,6 +1222,12 @@ AND m.id = #{merchantId} + + and m.id in + + #{mIdItem} + + ORDER BY o.create_date DESC