From d14623da62004a3a855bb13160cd5b051aebba04 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 12:27:25 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/WxBusinessController.java | 2 +- .../iformall/controller/WxBusinessController.java | 15 +++++++-------- .../com/iformall/mapper/WxBusinessMapper.java | 2 +- .../com/iformall/service/WxBusinessService.java | 2 +- .../service/impl/WxBusinessServiceImpl.java | 15 +++++++++------ .../iformall/service/impl/WxChartServiceImpl.java | 2 +- .../service/impl/WxCouponChannelServiceImpl.java | 9 +++++---- .../main/resources/mapper/WxBusinessMapper.xml | 10 ++++++++-- .../controller/sys/WxBusinessController.java | 2 +- .../iformall/controller/WxBusinessController.java | 2 +- 10 files changed, 35 insertions(+), 26 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 68d24c571..79af617b6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -43,7 +43,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态-全列表") public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - final List busList = wxBusinessService.findListAll(getTenantInfo(),null); + final List busList = wxBusinessService.findListAll(getTenantInfo(),null,null); return new ResultData(busList); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index aae158683..fb0534eef 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -1,27 +1,22 @@ package com.iformall.controller; -import com.github.pagehelper.PageInfo; import com.iformall.annotation.RedisCache; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxBusiness; -import com.iformall.domain.po.WxCUser; +import com.iformall.enums.EnumAppPlat; import com.iformall.service.WxBusinessService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.stream.Collectors; @RestController @RequestMapping("/api/wxBusiness") @Api(description = "业态查询接口") public class WxBusinessController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired @@ -31,7 +26,11 @@ public class WxBusinessController extends BaseController { @ApiOperation("业态全列表接口") @GetMapping("listAll") public ResultData listAll(Integer filter) { - return new ResultData(wxBusinessService.findListAll(getTenantInfo(),filter)); + EnumAppPlat appPlat = getCUser().getAppPlat(); + if(appPlat == null){ + appPlat = EnumAppPlat.WX; + } + return new ResultData(wxBusinessService.findListAll(getTenantInfo(),filter,appPlat.getCode())); } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index 3ea60cc2e..9405187d3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java @@ -12,7 +12,7 @@ public interface WxBusinessMapper extends CommonMapper { List findListAll(); List findListForMerchant(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); - List findListForCoupon(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); + List findListForCoupon(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); List> businessDataList(WxBusiness wxBusiness); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index 315d4c027..25dac7942 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -35,7 +35,7 @@ public interface WxBusinessService { * * @return */ - List findListAll(TenantEntity tenantEntity, Integer filter); + List findListAll(TenantEntity tenantEntity, Integer filter,Integer platCode); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index c89030fe1..b552c71f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -50,15 +50,18 @@ public class WxBusinessServiceImpl implements WxBusinessService { } @Override - public List findListAll(TenantEntity tenantEntity, Integer filter) { - if (filter == null) + public List findListAll(TenantEntity tenantEntity, Integer filter,Integer paltCode) { + if (filter == null){ return wxBusinessMapper.findListAll(); - else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) - return wxBusinessMapper.findListForCoupon(tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); - else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) + }else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) { + if (paltCode == null) + paltCode = EnumAppPlat.WX.getCode(); + return wxBusinessMapper.findListForCoupon(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); + }else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) { return wxBusinessMapper.findListForMerchant(tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); - else + }else { return wxBusinessMapper.findListAll(); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index a08c04a83..3ff2c7c5c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -599,7 +599,7 @@ public class WxChartServiceImpl implements WxChartDataService { kwMerchantMeterDataDto.setLimitCount(null); List businessPower = kwMerchantMeterService.findDataVoList(kwMerchantMeterDataDto); - List businessList = wxBusinessService.findListAll(tenantEntity,null); + List businessList = wxBusinessService.findListAll(tenantEntity,null,null); businessList.stream().forEach(b->{ Optional businessData = businessPower.stream().filter(bd->bd.getBusinessId().equals(b.getId())).findAny(); if (businessData.isPresent()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 6ed12119a..b8b4dfe48 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -291,12 +291,13 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Override public List newfindListVo(WxCouponChannel wxCouponChannel) { + List list = new ArrayList<>(); List mcids = new ArrayList<>(); if(wxCouponChannel.getMerchantId() != null){ mcids = wxCouponMerchantMapper.findOneMerchantProductIds(wxCouponChannel.getTenantId(), wxCouponChannel.getMerchantId()); if(mcids == null || mcids.isEmpty()){ - return null; + return list; } } WxCoupon couponQ = new WxCoupon(); @@ -312,15 +313,15 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } List cids = wxCouponMapper.findIdList(couponQ); if(cids == null || cids.isEmpty()){ - return null; + return list; } cids.retainAll(mcids); if(cids.isEmpty()){ - return null; + return list; } wxCouponChannel.setCouponIds(cids); - List list = wxCouponChannelMapper.newfindCList(wxCouponChannel); + list = wxCouponChannelMapper.newfindCList(wxCouponChannel); List couponIds = list.stream().map(cc -> cc.getCouponId()).collect(Collectors.toList()); Map couponMap = wxCouponService.getCouponMap(couponIds,wxCouponChannel); for (WxCouponChannelVo cc:list) { diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index dfe9d0b84..2d1d256ee 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -83,14 +83,20 @@ where (select count(*) from wx_coupon_channel cc where b.id = cc.business + and cc.status = 0 and cc.`tenant_id` = #{tenantId} and cc.`parent_tenant_id` = #{parentTenantId} - and cc.status = 0 - and cc.target_ad = 1) > 0 + + and cc.target_ad = 1 + + + and cc.target_ad = 101 + + ) > 0 order by create_date asc diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 68d24c571..79af617b6 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -43,7 +43,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态-全列表") public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - final List busList = wxBusinessService.findListAll(getTenantInfo(),null); + final List busList = wxBusinessService.findListAll(getTenantInfo(),null,null); return new ResultData(busList); } diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxBusinessController.java index 870298919..bc5320e33 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -25,7 +25,7 @@ public class WxBusinessController extends BaseController { @ApiOperation("业态全列表接口") @GetMapping("listAll") public ResultData listAll(Integer filter) { - return new ResultData(wxBusinessService.findListAll(getTenantInfo(),filter)); + return new ResultData(wxBusinessService.findListAll(getTenantInfo(),filter,null)); } }