From 7b0beb292345acbb5b38c1b8d707aa9076d008ea Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 2 Jul 2023 20:24:41 +0800 Subject: [PATCH] //..merchant --- .../controller/basic/WxBrandController.java | 3 ++- .../controller/basic/WxMerchantController.java | 1 + .../controller/sys/WxBusinessController.java | 7 +++---- .../iformall/schedule/DaliyAmountSchedule.java | 2 ++ .../java/com/iformall/domain/po/WxMerchant.java | 3 +++ .../com/iformall/enums/EnumMerchantAdmin.java | 10 ++++++++++ .../service/impl/DataTowerServiceImpl.java | 1 + .../service/impl/WxChartServiceImpl.java | 1 + .../WxCouponOrderReservationServiceImpl.java | 4 +++- .../service/impl/WxMerchantServiceImpl.java | 16 ++++++++++++++++ .../main/resources/mapper/WxMerchantMapper.xml | 6 ++++++ 11 files changed, 48 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 8ac33d2bc..26adf825e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.WxMerchant; import com.iformall.enums.EnumDelFlag; +import com.iformall.enums.EnumMerchantAdmin; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxBrandService; import com.iformall.service.WxMerchantService; @@ -81,7 +82,7 @@ public class WxBrandController extends BaseController { // wxMerchant.updateTenantInfo(wxBrand); wxMerchant.setIsDel(EnumYesOrNo.NO.getCode()); wxMerchant.setBrand(wxBrand.getId()); - + wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); List merchantList = wxMerchantService.findList(wxMerchant); if(CollectionUtils.isNotEmpty(merchantList)){ return new ResultData(Result.ERROR, "请先删除已绑定该品牌的商户。"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index ac324583b..4a71a303c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -213,6 +213,7 @@ public class WxMerchantController extends BaseController { wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); wxMerchant.setType(type); wxMerchant.setCarVendorType(0); + wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); } 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 75c1cef11..0599fdbcd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -9,10 +9,7 @@ import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxBusinessDataVo; -import com.iformall.enums.EnumCouponContentType; -import com.iformall.enums.EnumCouponSourceType; -import com.iformall.enums.EnumRentContractAppStatus; -import com.iformall.enums.EnumYesOrNo; +import com.iformall.enums.*; import com.iformall.service.ExcelService; import com.iformall.service.WxBusinessService; import com.iformall.service.WxMerchantService; @@ -116,6 +113,7 @@ public class WxBusinessController extends BaseController { WxMerchant merchantQ = new WxMerchant(); merchantQ.updateTenantInfo(tenantEntity); merchantQ.setBusinessId(b.getId()); + merchantQ.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); List merchantList = wxMerchantService.findList(merchantQ); if (null != merchantList && merchantList.size() > 0 ) { return new ResultData(Result.ERROR,"存在已关联的商户,不能删除"); @@ -124,6 +122,7 @@ public class WxBusinessController extends BaseController { WxMerchant merchantsubQ = new WxMerchant(); merchantsubQ.updateTenantInfo(tenantEntity); merchantsubQ.setSubBusinessId(b.getId()); + merchantsubQ.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); List merchantSubList = wxMerchantService.findList(merchantsubQ); if (null != merchantSubList && merchantSubList.size() > 0 ) { return new ResultData(Result.ERROR,"存在已关联的商户,不能删除"); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java index b1f77b6ce..0838ad6cd 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -4,6 +4,7 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxMerchantProductVo; import com.iformall.enums.EnumDateAmtType; +import com.iformall.enums.EnumMerchantAdmin; import com.iformall.enums.EnumMerchantStatus; import com.iformall.mapper.*; import com.iformall.service.WxDateAmountRecordService; @@ -151,6 +152,7 @@ public class DaliyAmountSchedule { WxMerchant merchantQ = new WxMerchant(); merchantQ.updateTenantInfo(mall.getTenantInfo()); merchantQ.setStatus(EnumMerchantStatus.VALID.getCode()); + merchantQ.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); List merchantList = wxMerchantMapper.findList(merchantQ); if (merchantList.size()==0) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 7e56a0987..44b63164e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -285,6 +285,9 @@ public class WxMerchant extends TenantEntity { private String coverPicture; @io.swagger.annotations.ApiModelProperty(value="EnumMerchantAdmin",name="isAdmin") private Integer isAdmin; + @TableField(exist = false) + private List adminTypes; + @io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime") private Date topTime; @io.swagger.annotations.ApiModelProperty(value="微信二维码地址",name="qrCode") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantAdmin.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantAdmin.java index ebd5f84f1..5490da662 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantAdmin.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantAdmin.java @@ -1,5 +1,8 @@ package com.iformall.enums; +import java.util.ArrayList; +import java.util.List; + /** * Created by Stormeye on 2018/08/09. */ @@ -36,4 +39,11 @@ public enum EnumMerchantAdmin { public String getMessage() { return message; } + + public static List getOrdinaryTypes(){ + List adminTypes = new ArrayList(); + adminTypes.add(PUBLIC_COMMON.code); + adminTypes.add(PUBLIC_ADMIN.code); + return adminTypes; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 8d2e742e7..f57030ab2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -170,6 +170,7 @@ public class DataTowerServiceImpl implements DataTowerService { WxMerchant wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(tenantEntity); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); List merchants = wxMerchantMapper.findList(wxMerchant); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); 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 c4db94d02..5ddd41cea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2716,6 +2716,7 @@ public class WxChartServiceImpl implements WxChartDataService { WxMerchant wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(tenantEntity); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); List merchants = wxMerchantMapper.findList(wxMerchant); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); wxMerchantTradeDaily.updateTenantInfo(tenantEntity); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java index d2c0484f2..f2cddf068 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java @@ -52,8 +52,10 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva if(EnumMerchantAdmin.REGIONAL.getCode().equals(merchant.getIsAdmin())){ //通过区域商户id查询所有子商户 List collect = wxMerchantRelationService.getRelationByRegionId(merchant.getId()); - if (!CollectionUtils.isEmpty(collect)){ + if (collect != null && collect.size() > 0){ record.setReservationMerchantIdList(collect); + }else{ + record.setId(-999L); } record.setReservationMerchantId(null); } 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 715ea04c5..f05aaaba5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -162,6 +162,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { + if(record.getIsAdmin() == null){ + record.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); + } return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); } @@ -288,6 +291,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public List findIdList(WxMerchant record) { + if(record == null){ + record.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); + } return wxMerchantMapper.findIdList(record); } @@ -307,6 +313,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.updateTenantInfo(tenantEntity); wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); List wxMerchantList = wxMerchantMapper.findList(wxMerchant); List collect = wxMerchantList.stream().map(x -> { WxMerchantSimpleVo wxMerchantSimpleVo = new WxMerchantSimpleVo(); @@ -1013,6 +1020,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public void exportData(WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { + if(wxMerchant.getIsAdmin() == null){ + wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); + } + List list = wxMerchantMapper.findList(wxMerchant); WxBusiness bq = new WxBusiness(); @@ -1145,6 +1156,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { private void initQueryParam(WxMerchant record,boolean hasRentContractInfo,Map merchantRentMap) { + if(record.getIsAdmin() == null){ + record.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); + } + if (hasRentContractInfo) { WxRentContract wxRentContractQ = new WxRentContract(); wxRentContractQ.updateTenantInfo(record); @@ -2030,6 +2045,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setTenantId(tenantEntity.getFinalTenantId()); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); wxMerchant.setBrand(brand); + wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); List list = findList(wxMerchant); if(list.size() > 0){ return list.get(0); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index fb61944cc..41af5b544 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -168,6 +168,12 @@ and m.`credit_locked` = #{creditLocked} + + and m.`is_admin` in + + #{typeItem} + + and m.id in