From 44b2d05fa84922a2c9f1f4da4c4b49a0663f9eee Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 20 Sep 2019 12:04:49 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E6=94=B9]:=E5=95=86?= =?UTF-8?q?=E6=88=B7=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantController.java | 11 +++-- .../iformall/domain/dto/WxMerchantDto.java | 48 +++++++++++++++++++ .../com/iformall/mapper/WxMerchantMapper.java | 3 +- .../iformall/service/WxMerchantService.java | 3 +- .../service/impl/WxBillAllServiceImpl.java | 9 ++-- .../service/impl/WxMerchantServiceImpl.java | 5 +- .../WxProfitSharingReceiverServiceImpl.java | 7 +-- .../resources/mapper/WxMerchantMapper.xml | 2 +- 8 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index b98c7247f..93ae24e39 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumMerchantPublic; @@ -36,12 +37,12 @@ public class WxMerchantController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(@ModelAttribute WxMerchantVo wxMerchant, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxMerchantDto wxMerchantDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); - if (null == wxMerchant) wxMerchant = new WxMerchantVo(); - wxMerchant.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); - wxMerchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); - return new ResultData(wxMerchantService.listAsPageCVo(wxMerchant, pageNum, pageSize)); + if (null == wxMerchantDto) wxMerchantDto = new WxMerchantDto(); + wxMerchantDto.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); + wxMerchantDto.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); + return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize)); } @ApiOperation("根据code查询接口") diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java new file mode 100644 index 000000000..975c8d8fc --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java @@ -0,0 +1,48 @@ +package com.iformall.domain.dto; + +import lombok.Data; + +@Data +public class WxMerchantDto { + private static final long serialVersionUID = 6687964942922444531L; + + protected Long id; + + /** 发券商户信息 */ + + @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") + private String merchantName; + + @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") + private String merchantLinkPhone; + + @io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="status") + private Integer merchantStatus; + + @io.swagger.annotations.ApiModelProperty(value="商户业态",name="businessId") + private Integer businessId; + + @io.swagger.annotations.ApiModelProperty(value="商户子业态",name="subBusinessId") + private Integer subBusinessId; + + @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") + private String shopNumber; + + @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") + private Integer building; + + @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") + private Integer floor; + + @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") + private Integer isPublic; + + @io.swagger.annotations.ApiModelProperty(value = "品牌名称", name = "brandName") + private String brandName; + + @io.swagger.annotations.ApiModelProperty(value = "店面类型", name = "shopType") + private Integer shopType; + + @io.swagger.annotations.ApiModelProperty(value = "客服电话", name = "linkLinePhone") + private String linkLinePhone; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 987f33878..b1a735671 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.vo.WxMerchantVo; import java.util.HashMap; @@ -11,7 +12,7 @@ import java.util.Map; public interface WxMerchantMapper extends CommonMapper { List findList(WxMerchant wxMerchant); - List findListCVo(WxMerchantVo wxMerchantVo); + List findListCVo(WxMerchantDto wxMerchantDto); WxMerchantVo getMerchantByCode(HashMap params); WxMerchant queryMerchantByMerchantIdOfSharingReceiver(WxMerchant wxMerchant); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 90c326a6b..4a0afe927 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.vo.WxMerchantSimpleVo; @@ -27,7 +28,7 @@ public interface WxMerchantService { * @return */ PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize); - PageInfo listAsPageCVo(WxMerchantVo record, Integer pageIndex, Integer pageSize); + PageInfo listAsPageCVo(WxMerchantDto record, Integer pageIndex, Integer pageSize); /** * 根据code查询 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 1b29a8854..d6fae6966 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; +import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.vo.*; @@ -793,10 +794,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { result.put("depositDetail", StringUtils.isNotEmpty(depositDetail.toString()) ? depositDetail.toString() : " "); result.put("otherDetail", StringUtils.isNotEmpty(otherDetail.toString()) ? otherDetail.toString() : " "); - WxMerchantVo wxMerchantVo = new WxMerchantVo(); - wxMerchantVo.setId(wxBillAll.getMerchantId()); - List listCVo = wxMerchantMapper.findListCVo(wxMerchantVo); - wxMerchantVo = listCVo.get(0); + WxMerchantDto wxMerchantDto = new WxMerchantDto(); + wxMerchantDto.setId(wxBillAll.getMerchantId()); + List listCVo = wxMerchantMapper.findListCVo(wxMerchantDto); + WxMerchantVo wxMerchantVo = listCVo.get(0); result.put("merchant", wxMerchantVo.getMerchantName()); WxShopVo wxShopVo = wxMerchantVo.getShopVoList().stream() .filter(s -> StringUtils.isNotEmpty(s.getLinkPhone()) || StringUtils.isNotEmpty(s.getLinkPerson())).findFirst().orElse(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 e26d4b530..d1ff5ccf1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxMerchantSimpleVo; import com.iformall.domain.vo.WxMerchantVo; @@ -108,7 +109,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override - public PageInfo listAsPageCVo(WxMerchantVo record, Integer pageIndex, Integer pageSize) { + public PageInfo listAsPageCVo(WxMerchantDto record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findListCVo(record)); } @@ -612,7 +613,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public WxMerchantVo findMerchantById(Long id) { - WxMerchantVo merchant = new WxMerchantVo(); + WxMerchantDto merchant = new WxMerchantDto(); merchant.setId(id); List listCVo = wxMerchantMapper.findListCVo(merchant); return listCVo.isEmpty() ? new WxMerchantVo() : listCVo.get(0); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java index 796d9e227..aada3acef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; +import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccount; @@ -194,9 +195,9 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv } private void sendMsgByType(Integer type, Long merchantId, String account, String tenantId) { - WxMerchantVo wxMerchantVo = new WxMerchantVo(); - wxMerchantVo.setId(merchantId); - List listCVo = wxMerchantMapper.findListCVo(wxMerchantVo); + WxMerchantDto wxMerchantDto = new WxMerchantDto(); + wxMerchantDto.setId(merchantId); + List listCVo = wxMerchantMapper.findListCVo(wxMerchantDto); if (listCVo.isEmpty()) { logger.info("更新商户分账账户发短信时未找到商户:" + merchantId); return; diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index cebafdc5e..2ae435d96 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -328,7 +328,7 @@ - select FROM wx_merchant m