From 9b7ad8d757b30404db9ea5c2ee0172a314dfaf22 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Sun, 2 Jul 2023 10:34:54 +0800 Subject: [PATCH 1/3] fix poi --- .../iformall/controller/mem/AsyncTask.java | 47 ++++++++++--------- .../iformall/domain/vo/MerchantPoiTNew.java | 40 +++++++--------- 2 files changed, 42 insertions(+), 45 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index 9dd2ebe45..4a3692fa1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -8,6 +8,7 @@ import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.iformall.common.ErrorCode; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxTags; @@ -239,7 +240,7 @@ public class AsyncTask { public void exportExcelPoiDataAddLocationForNew(String gaodeKey,File file,HttpServletRequest request, HttpServletResponse response) throws Exception { ImportParams params = new ImportParams(); // 需要验证 - String[] headers = new String[]{"门店名称", "门店ID", "城市", "详细地址","富茂系统省份", "富茂系统城市", "富茂系统地址","富茂系统经度", "富茂系统纬度","高德匹配备注", "富茂系统商户ID", "富茂系统商户名称"}; + String[] headers = new String[]{"富茂系统商户ID", "富茂系统商户名称","门店名称", "门店ID", "城市", "详细地址","富茂系统省份", "富茂系统城市", "富茂系统地址","富茂系统经度", "富茂系统纬度","高德匹配备注"}; params.setImportFields(headers); IExcelDataHandler handler = new AsyncTask.PoiNewExcelHandler(); handler.setNeedHandlerFields(new String[]{"门店名称", "门店ID", "城市", "详细地址"}); @@ -265,34 +266,38 @@ public class AsyncTask { List successList = datalist.getList(); //List failList = datalist.getFailList(); if(null != successList && successList.size() > 0 ) { - List tlist = new ArrayList(); try { successList.parallelStream().forEach(poiBase -> { try { - GaoDePoiInfo gaodeInfo = ttMerchantPoiService.queryGaoDePoiInfo(gaodeKey, poiBase.getPoiCity()+poiBase.getPoiAddress()); - if (null != gaodeInfo) { - if (gaodeInfo.isSuccess()) { - poiBase.setProvince(gaodeInfo.getProvince()); - poiBase.setCity(gaodeInfo.getCity()); - poiBase.setAddress(poiBase.getPoiAddress()); - poiBase.setLongitude(gaodeInfo.getLongitude()); - poiBase.setLatitude(gaodeInfo.getLatitude()); - poiBase.setGaodeRemark("匹配成功"); - }else { - poiBase.setGaodeRemark("匹配失败,"+gaodeInfo.getErrMsg()); - } - }else { - poiBase.setGaodeRemark("未匹配到信息"); - } - tlist.add(poiBase); + if (StringUtils.isNotBlank(poiBase.getProvince()) && StringUtils.isNotBlank(poiBase.getCity()) + && StringUtils.isNotBlank(poiBase.getAddress()) && null != poiBase.getLongitude() && null != poiBase.getLatitude()) { + //do nothing + }else { + GaoDePoiInfo gaodeInfo = ttMerchantPoiService.queryGaoDePoiInfo(gaodeKey, poiBase.getPoiCity()+poiBase.getPoiAddress()); + if (null != gaodeInfo) { + if (gaodeInfo.isSuccess()) { + poiBase.setProvince(gaodeInfo.getProvince()); + poiBase.setCity(gaodeInfo.getCity()); + poiBase.setAddress(poiBase.getPoiAddress()); + poiBase.setLongitude(gaodeInfo.getLongitude()); + poiBase.setLatitude(gaodeInfo.getLatitude()); + poiBase.setGaodeRemark("匹配成功"); + }else { + poiBase.setGaodeRemark("匹配失败,"+gaodeInfo.getErrMsg()); + } + }else { + poiBase.setGaodeRemark("未匹配到信息"); + } + } } catch (UnknownSessionException ue) { logger.error("session :"+ue.getMessage()); + poiBase.setGaodeRemark("查询高德API失败"); } }); ExportParams exportParams = new ExportParams(); //exportParams.setCreateHeadRows(true); //exportParams.setExclusions(headers); - Workbook workBook = ExcelExportUtil.exportExcel(exportParams, MerchantPoiTNew.class, tlist); + Workbook workBook = ExcelExportUtil.exportExcel(exportParams, MerchantPoiTNew.class, successList); exportExcel(request, response, workBook, "POI匹配模版-高德.xls"); } catch (Exception e) { logger.error("更新地理信息失败:"+e.getMessage(),e); @@ -316,10 +321,10 @@ public class AsyncTask { public void importExcelPoiDataForNew(File file, MallUserInfo user, String importKey) { ImportParams params = new ImportParams(); // 需要验证 - String[] headers = new String[]{"门店名称", "门店ID", "城市", "详细地址","富茂系统省份", "富茂系统城市", "富茂系统地址","富茂系统经度", "富茂系统纬度","高德匹配备注", "富茂系统商户ID", "富茂系统商户名称"}; + String[] headers = new String[]{"富茂系统商户ID", "富茂系统商户名称","门店名称", "门店ID", "城市", "详细地址","富茂系统省份", "富茂系统城市", "富茂系统地址","富茂系统经度", "富茂系统纬度","高德匹配备注"}; params.setImportFields(headers); IExcelDataHandler handler = new AsyncTask.PoiNewExcelHandler(); - handler.setNeedHandlerFields(new String[]{"富茂商户ID","来客门店ID","富茂系统省份", "富茂系统城市", "富茂系统地址","富茂系统经度", "富茂系统纬度"}); + handler.setNeedHandlerFields(new String[]{"富茂系统商户ID","门店ID","富茂系统省份", "富茂系统城市", "富茂系统地址","富茂系统经度", "富茂系统纬度"}); params.setNeedVerify(true); ExcelImportResult datalist = null; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java index dbb7545ca..813777ad4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java @@ -12,50 +12,42 @@ import java.math.BigDecimal; @Data public class MerchantPoiTNew implements Serializable { - @Excel(name = "门店名称", width = 20, orderNum = "1") + @Excel(name="富茂系统商户ID",width = 20,orderNum = "1") + @io.swagger.annotations.ApiModelProperty(value="富茂系统商户ID",name="merchantId") + private String merchantId; + @Excel(name="富茂系统商户名称",width = 20,orderNum = "2") + @io.swagger.annotations.ApiModelProperty(value="富茂系统商户名称",name="merchantName") + private String merchantName; + @Excel(name = "门店名称", width = 20, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="来客门店名称",name="poiName") private String poiName; - @Excel(name="门店ID",width = 20,orderNum = "2") + @Excel(name="门店ID",width = 20,orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="来客门店ID",name="poiId") private String poiId; - @Excel(name = "城市", width = 20, orderNum = "3") + @Excel(name = "城市", width = 20, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="来客门店城市",name="poiCity") private String poiCity; - @Excel(name = "详细地址", width = 20, orderNum = "4") + @Excel(name = "详细地址", width = 20, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="来客门店详细地址",name="poiAddress") private String poiAddress; - @Excel(name = "富茂系统省份", width = 20, orderNum = "5") + @Excel(name = "富茂系统省份", width = 20, orderNum = "7") @io.swagger.annotations.ApiModelProperty(value="富茂系统省份",name="province") private String province; - @Excel(name = "富茂系统城市", width = 20, orderNum = "6") + @Excel(name = "富茂系统城市", width = 20, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value="富茂系统城市",name="city") private String city; - @Excel(name = "富茂系统地址", width = 20, orderNum = "7") + @Excel(name = "富茂系统地址", width = 20, orderNum = "9") @io.swagger.annotations.ApiModelProperty(value="富茂系统地址",name="address") private String address; - @Excel(name="富茂系统经度",width = 20,orderNum = "8") + @Excel(name="富茂系统经度",width = 20,orderNum = "10") @io.swagger.annotations.ApiModelProperty(value="富茂系统经度",name="longitude") private BigDecimal longitude; - @Excel(name = "富茂系统纬度", width = 20, orderNum = "9") + @Excel(name = "富茂系统纬度", width = 20, orderNum = "11") @io.swagger.annotations.ApiModelProperty(value="富茂系统纬度",name="latitude") private BigDecimal latitude; - @Excel(name = "高德匹配备注", width = 20, orderNum = "10") + @Excel(name = "高德匹配备注", width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value="高德匹配备注",name="gaodeRemark") private String gaodeRemark; - @Excel(name="富茂系统商户ID",width = 20,orderNum = "11") - @io.swagger.annotations.ApiModelProperty(value="富茂系统商户ID",name="merchantId") - private String merchantId; - @Excel(name="富茂系统商户名称",width = 20,orderNum = "12") - @io.swagger.annotations.ApiModelProperty(value="富茂系统商户名称",name="merchantName") - private String merchantName; - - - - - - - - } From c1f26a22685a07d39f8e3eae9b853896a0ac7f4b Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Sun, 2 Jul 2023 10:37:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AD=90=E5=95=86=E6=88=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E5=AD=97=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/basic/WxMerchantController.java | 5 +++-- .../src/main/java/com/iformall/mapper/WxMerchantMapper.java | 5 +---- .../main/java/com/iformall/service/WxMerchantService.java | 2 +- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxMerchantMapper.xml | 3 +++ 5 files changed, 10 insertions(+), 9 deletions(-) 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 e583d4962..6cd8b5cbf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -131,10 +131,11 @@ public class WxMerchantController extends BaseController { @ApiOperation("子商户列表查询") @GetMapping("/subMerchantList") + @ApiImplicitParam(name = "subName", value = "subName", dataType = "Long", paramType = "query", required = true) @SystemControllerLog(description = "子商户列表查询") - public ResultData subMerchantList() { + public ResultData subMerchantList(String subName) { logger.debug("[" + getIpAddr() + "] WxMerchantController::subMerchantList"); - List merchants = wxMerchantService.subMerchantList(); + List merchants = wxMerchantService.subMerchantList(subName); return new ResultData(merchants); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index e74f0fdc7..1b14de1ae 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -4,9 +4,6 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.WxMerchantTradeDetailVo; -import com.iformall.domain.vo.WxMerchantTradeVo; -import com.iformall.domain.vo.WxMerchantVo; import org.apache.ibatis.annotations.Param; import java.util.HashMap; @@ -61,5 +58,5 @@ public interface WxMerchantMapper extends CommonMapper { List getMerchantListByIds(@Param("relationIds") List relationIds); - List getSubMerchantListByIds(@Param("merchantIds") List merchantIds); + List getSubMerchantListByIds(@Param("merchantIds") List merchantIds,@Param("subName") String subName); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 70b2a5613..aeddceb80 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -218,6 +218,6 @@ public interface WxMerchantService { List relationList(Long regionId); - List subMerchantList(); + List subMerchantList(String subName); } 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 e4ba1a36e..bdf1f2c69 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2076,9 +2076,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { * 查询剩余子商户 */ @Override - public List subMerchantList() { + public List subMerchantList(String subName) { //查询已经被选择了的子商户 List merchantIds = wxMerchantRelationService.getRelationByRegionId(null); - return wxMerchantMapper.getSubMerchantListByIds(merchantIds); + return wxMerchantMapper.getSubMerchantListByIds(merchantIds,subName); } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 36c9a6843..9448c93cf 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -472,6 +472,9 @@ #{idItem} + + and name like concat('%',#{subName},'%') + From b523c19d895b83aa880864d5ca492caddfdf8fd9 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Sun, 2 Jul 2023 10:56:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=AD=90=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/WxMerchantController.java | 12 +++++++---- .../com/iformall/domain/po/WxMerchant.java | 2 ++ .../com/iformall/mapper/WxMerchantMapper.java | 1 - .../iformall/service/WxMerchantService.java | 2 +- .../service/impl/WxMerchantServiceImpl.java | 6 ++++-- .../resources/mapper/WxMerchantMapper.xml | 21 ++++++------------- 6 files changed, 21 insertions(+), 23 deletions(-) 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 6cd8b5cbf..1df48c3e6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -131,12 +131,16 @@ public class WxMerchantController extends BaseController { @ApiOperation("子商户列表查询") @GetMapping("/subMerchantList") - @ApiImplicitParam(name = "subName", value = "subName", dataType = "Long", paramType = "query", required = true) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "子商户列表查询") - public ResultData subMerchantList(String subName) { + public ResultData subMerchantList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::subMerchantList"); - List merchants = wxMerchantService.subMerchantList(subName); - return new ResultData(merchants); + if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + PageInfo pageInfo = wxMerchantService.subMerchantList(wxMerchant, pageNum, pageSize); + return new ResultData(pageInfo); } @ApiOperation("分页列表接口") 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 351e07485..7e56a0987 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -428,5 +428,7 @@ public class WxMerchant extends TenantEntity { private Integer hasCarVendor; @TableField(exist = false) private Integer noCarVendor; + @TableField(exist = false) + private List merchantIds; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 1b14de1ae..7b0f6e395 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -58,5 +58,4 @@ public interface WxMerchantMapper extends CommonMapper { List getMerchantListByIds(@Param("relationIds") List relationIds); - List getSubMerchantListByIds(@Param("merchantIds") List merchantIds,@Param("subName") String subName); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index aeddceb80..be62a49f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -218,6 +218,6 @@ public interface WxMerchantService { List relationList(Long regionId); - List subMerchantList(String subName); + PageInfo subMerchantList(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); } 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 bdf1f2c69..330d0b4b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2076,9 +2076,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { * 查询剩余子商户 */ @Override - public List subMerchantList(String subName) { + public PageInfo subMerchantList(WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { //查询已经被选择了的子商户 List merchantIds = wxMerchantRelationService.getRelationByRegionId(null); - return wxMerchantMapper.getSubMerchantListByIds(merchantIds,subName); + wxMerchant.setMerchantIds(merchantIds); + PageInfo pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(wxMerchant)); + return pageInfo; } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 9448c93cf..6536170cd 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -180,6 +180,12 @@ #{notInIdItem} + + and m.id NOT IN + + #{idItem} + + order by ${sortColumns} @@ -462,19 +468,4 @@ - -