From 2eb886d5ff9a32eac8525d088a2b95d10b70af27 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 26 Aug 2022 17:21:33 +0800 Subject: [PATCH] // test --- .../iformall/controller/BankController.java | 7 +++ .../java/com/iformall/utils/ImgYwsqhUtil.java | 32 ++++++------- .../domain/po/WxBankProvinceCity.java | 29 ++++++++++++ .../mapper/WxBankProvinceCityMapper.java | 12 +++++ .../service/bank/WxBankUtilService.java | 1 + .../bank/impl/WxBankUtilServiceImpl.java | 35 ++++++++++++++ .../mapper/WxBankProvinceCityMapper.xml | 46 +++++++++++++++++++ 7 files changed, 146 insertions(+), 16 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxBankProvinceCity.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxBankProvinceCityMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxBankProvinceCityMapper.xml diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BankController.java b/mallinkBApi/src/main/java/com/iformall/controller/BankController.java index 917ed907d..7d22b5da3 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BankController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BankController.java @@ -146,4 +146,11 @@ public class BankController extends BaseController{ return wxBankUtilService.bankBranches(getTenantInfo(),bankAliasCode,cityCode); } + @ApiOperation("查省市") + @GetMapping("initProvincesCities") + public ResultData initProvincesCities() { + logger.debug("[" + getIpAddr() + "] BankController::areasProvinces"); + return wxBankUtilService.initProvincesCities(getTenantInfo()); + } + } diff --git a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java index aac2bf99d..0dc44f01d 100644 --- a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java +++ b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java @@ -124,20 +124,20 @@ public class ImgYwsqhUtil { return null; } -// public static void main(String[] args) { -// String serverUploadImgUrl = "C:/Users/xiaohu/Desktop/img"; // 图片保存路径 -// try { -// byte[] bytes = imgCeate("周淼淼","421302199908081234","商务发展部","商务经理", -// "周淼淼","421302199908081234","2020-08-08","长期", -// false,"武汉富茂链客科技有限公司"); -// ByteArrayInputStream bais = new ByteArrayInputStream(bytes); -// BufferedImage bi1 =ImageIO.read(bais); -// -// ImageIO.write(bi1, "png", new File(serverUploadImgUrl+"/0.png")); -// -// } catch (Exception e) { -// e.printStackTrace(); -// } -// System.out.println("结束"); -// } + public static void main(String[] args) { + String serverUploadImgUrl = "C:/Users/xiaohu/Desktop/img"; // 图片保存路径 + try { + byte[] bytes = imgCeate("周思琦","421302199908031245","运营部","经理", + "王若非","612101194701250412","2007-10-29","长期", + true,"北京富茂科技有限公司"); + ByteArrayInputStream bais = new ByteArrayInputStream(bytes); + BufferedImage bi1 =ImageIO.read(bais); + + ImageIO.write(bi1, "png", new File(serverUploadImgUrl+"/0.png")); + + } catch (Exception e) { + e.printStackTrace(); + } + System.out.println("结束"); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBankProvinceCity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBankProvinceCity.java new file mode 100644 index 000000000..dc3b08663 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBankProvinceCity.java @@ -0,0 +1,29 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +@TableName(value = "wx_bank_province_city") +@Data +@EqualsAndHashCode(callSuper = true) +public class WxBankProvinceCity extends BaseEntity { + + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="",name="parentId") + private Long parentId; + @io.swagger.annotations.ApiModelProperty(value="",name="regionCode") + private String regionCode; + @io.swagger.annotations.ApiModelProperty(value="",name="provinceCode") + private Integer provinceCode; + @io.swagger.annotations.ApiModelProperty(value="",name="provinceName") + private String provinceName; + @io.swagger.annotations.ApiModelProperty(value="",name="cityCode") + private Integer cityCode; + @io.swagger.annotations.ApiModelProperty(value="",name="cityName") + private String cityName; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBankProvinceCityMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBankProvinceCityMapper.java new file mode 100644 index 000000000..e3d69207f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBankProvinceCityMapper.java @@ -0,0 +1,12 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxBankProvinceCity; + +import java.util.List; + +public interface WxBankProvinceCityMapper extends CommonMapper { + + List findList(WxBankProvinceCity apply); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/bank/WxBankUtilService.java b/mallinkService/src/main/java/com/iformall/service/bank/WxBankUtilService.java index 6cb692951..37455f58a 100644 --- a/mallinkService/src/main/java/com/iformall/service/bank/WxBankUtilService.java +++ b/mallinkService/src/main/java/com/iformall/service/bank/WxBankUtilService.java @@ -24,4 +24,5 @@ public interface WxBankUtilService { ResultData bankBranches(TenantEntity tenantInfo, String bankAliasCode, Integer cityCode); + ResultData initProvincesCities(TenantEntity tenantInfo); } diff --git a/mallinkService/src/main/java/com/iformall/service/bank/impl/WxBankUtilServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/bank/impl/WxBankUtilServiceImpl.java index 6462a7646..c9b762baf 100644 --- a/mallinkService/src/main/java/com/iformall/service/bank/impl/WxBankUtilServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/bank/impl/WxBankUtilServiceImpl.java @@ -5,7 +5,9 @@ import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBankProvinceCity; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.mapper.WxBankProvinceCityMapper; import com.iformall.service.WxPayAccountService; import com.iformall.service.bank.WxBankUtilService; import com.iformall.utils.RedisCacheUtils; @@ -28,6 +30,9 @@ public class WxBankUtilServiceImpl implements WxBankUtilService { @Autowired WxPayAccountService wxPayAccountService; + @Autowired + WxBankProvinceCityMapper wxBankProvinceCityMapper; + @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate bankRedisTemplate; @@ -238,4 +243,34 @@ public class WxBankUtilServiceImpl implements WxBankUtilService { } return new ResultData(bankInfoList); } + + @Override + public ResultData initProvincesCities(TenantEntity tenantInfo) { + WxPayService wxPayService = wxPayAccountService.getWxPayService(tenantInfo.getTenantId()); + try { + ProvincesResult provincesResult = wxPayService.getBankService().areasProvinces(); + for (ProvincesResult.ProvinceInfo provinceInfo:provincesResult.getData()) { + WxBankProvinceCity province = new WxBankProvinceCity(); + province.setParentId(0l); + province.setProvinceCode(provinceInfo.getProvinceCode()); + province.setProvinceName(provinceInfo.getProvinceName()); + wxBankProvinceCityMapper.insert(province); + + CitiesResult citiesResult = wxPayService.getBankService().areasCities(provinceInfo.getProvinceCode()); + for (CitiesResult.CityInfo cityInfo:citiesResult.getData()) { + WxBankProvinceCity city = new WxBankProvinceCity(); + city.setParentId(province.getId()); + city.setProvinceCode(provinceInfo.getProvinceCode()); + city.setProvinceName(provinceInfo.getProvinceName()); + city.setCityCode(cityInfo.getCityCode()); + city.setCityName(cityInfo.getCityName()); + wxBankProvinceCityMapper.insert(city); + } + } + return new ResultData(); + } catch (WxPayException e) { + e.printStackTrace(); + return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); + } + } } diff --git a/mallinkService/src/main/resources/mapper/WxBankProvinceCityMapper.xml b/mallinkService/src/main/resources/mapper/WxBankProvinceCityMapper.xml new file mode 100644 index 000000000..a3be06c80 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxBankProvinceCityMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + `id`,`parent_id`,`region_code`,`province_code`,`province_name`,`city_code`,`city_name` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `parent_id` = #{parentId} + + + and `region_code` = #{regionCode} + + + and `province_code` = #{provinceCode} + + + and `city_code` = #{cityCode} + + + + + +