From 49c9f2660f6e943946f57dd543ee9782d290c10d Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 16 Sep 2022 15:11:30 +0800 Subject: [PATCH] //merchant --- .../controller/basic/WxBrandController.java | 3 ++- .../controller/basic/WxMerchantController.java | 4 ++++ .../contract/WxRentContractController.java | 12 ++---------- .../controller/WxMerchantController.java | 2 ++ .../com/iformall/domain/dto/WxMerchantDto.java | 3 +++ .../service/impl/WxMerchantServiceImpl.java | 17 ++--------------- .../main/resources/mapper/WxMerchantMapper.xml | 7 ++++++- .../controller/basic/WxMerchantController.java | 5 +++++ .../controller/WxMerchantController.java | 3 +++ 9 files changed, 29 insertions(+), 27 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 221cc814d..bcbc18009 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -9,6 +9,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.EnumYesOrNo; import com.iformall.service.WxBrandService; import com.iformall.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; @@ -72,7 +73,7 @@ public class WxBrandController extends BaseController { //判断是否解绑商户 WxMerchant wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(wxBrand); - wxMerchant.setIsDel(0); + wxMerchant.setIsDel(EnumYesOrNo.NO.getCode()); wxMerchant.setBrand(wxBrand.getId()); List merchantList = wxMerchantService.findList(wxMerchant); 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 adc51cacc..a8c43a580 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -66,6 +66,7 @@ public class WxMerchantController extends BaseController { if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,true); return new ResultData(page); } @@ -83,6 +84,7 @@ public class WxMerchantController extends BaseController { if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); } @@ -100,6 +102,7 @@ public class WxMerchantController extends BaseController { if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } @@ -277,6 +280,7 @@ public class WxMerchantController extends BaseController { public void exportData(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); wxMerchantService.exportData(wxMerchant,request,response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index f3e5e7cd2..2a49d38eb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -10,6 +10,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.iformall.enums.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,16 +42,6 @@ import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity.SortField; -import com.iformall.enums.EnumContractOperationType; -import com.iformall.enums.EnumContractType; -import com.iformall.enums.EnumFlowContractType; -import com.iformall.enums.EnumFlowKey; -import com.iformall.enums.EnumFromType; -import com.iformall.enums.EnumIsPreview; -import com.iformall.enums.EnumRentContractAppStatus; -import com.iformall.enums.EnumRentContractStatus; -import com.iformall.enums.EnumRentShopType; -import com.iformall.enums.EnumRentStartType; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillPropertyMapper; import com.iformall.mapper.WxBillRentMapper; @@ -753,6 +744,7 @@ public class WxRentContractController extends WxContractBaseController { WxMerchant wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setRentShopType(shopType); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getMerchantList(wxMerchant)); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index ee61a99da..3ae93e76f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -8,6 +8,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumMerchantPublic; import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxMerchantService; import com.iformall.utils.HashUtil; import io.swagger.annotations.ApiImplicitParam; @@ -43,6 +44,7 @@ public class WxMerchantController extends BaseController { wxMerchantDto.updateTenantInfo(getTenantInfo()); wxMerchantDto.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); wxMerchantDto.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); + wxMerchantDto.setIsPrivate(EnumYesOrNo.NO.getCode()); return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize,true)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java index fe6127f19..af2f59edd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java @@ -37,6 +37,9 @@ public class WxMerchantDto extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") private Integer isPublic; + @io.swagger.annotations.ApiModelProperty(value = "是否显示在广场", name = "isPrivate") + private Integer isPrivate; + @io.swagger.annotations.ApiModelProperty(value = "品牌名称", name = "brandName") private String brandName; 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 48b8007e0..3d88cb92f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -153,9 +153,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { - if(record.getIsPrivate() == null){ - record.setIsPrivate(EnumYesOrNo.NO.getCode()); - } return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); } @@ -275,9 +272,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public List findList(WxMerchant record) { - if(record.getIsPrivate() == null){ - record.setIsPrivate(EnumYesOrNo.NO.getCode()); - } return wxMerchantMapper.findList(record); } @@ -285,9 +279,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { public List findList(TenantEntity tenantEntity) { WxMerchant wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(tenantEntity); - if(wxMerchant.getIsPrivate() == null){ - wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); - } + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); List wxMerchantList = wxMerchantMapper.findList(wxMerchant); List collect = wxMerchantList.stream().map(x -> { @@ -938,9 +930,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public void exportData(WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { - if(wxMerchant.getIsPrivate() == null){ - wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); - } + List list = wxMerchantMapper.findList(wxMerchant); list.stream().forEach(m->{ @@ -1183,9 +1173,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public PageInfo listVoAsPage(WxMerchant record, Integer pageIndex, Integer pageSize,boolean hasRentContractInfo) { - if(record.getIsPrivate() == null){ - record.setIsPrivate(EnumYesOrNo.NO.getCode()); - } Map merchantRentMap = new HashMap(); initQueryParam(record,hasRentContractInfo, merchantRentMap); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index ff34695e8..532f627f3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -347,13 +347,18 @@ diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 495917096..060091003 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -17,6 +17,7 @@ import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumPayWay; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.QrCodeService; import com.iformall.service.WxMerchantService; import com.iformall.utils.Constant; @@ -59,6 +60,7 @@ public class WxMerchantController extends BaseController { if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); } @@ -76,6 +78,7 @@ public class WxMerchantController extends BaseController { if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); } @@ -93,6 +96,7 @@ public class WxMerchantController extends BaseController { if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } @@ -244,6 +248,7 @@ public class WxMerchantController extends BaseController { public void exportData(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); wxMerchantService.exportData(wxMerchant,request,response); } diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java index 912610d1a..45b707be9 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -10,6 +10,7 @@ import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumMerchantPublic; import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumTtCouponStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.service.WxMerchantService; import com.iformall.utils.HashUtil; @@ -46,6 +47,7 @@ public class WxMerchantController extends BaseController { wxMerchantDto.updateTenantInfo(getParentTenantInfo()); wxMerchantDto.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); wxMerchantDto.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); + wxMerchantDto.setIsPrivate(EnumYesOrNo.NO.getCode()); return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize,true)); } @@ -60,6 +62,7 @@ public class WxMerchantController extends BaseController { merchant.updateTenantInfo(getParentTenantInfo()); merchant.setStatus(EnumMerchantStatus.VALID.getCode()); merchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); + merchant.setIsPrivate(EnumYesOrNo.NO.getCode()); return new ResultData(wxMerchantService.listAsPage(merchant, pageNum, pageSize)); }