diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java index f778c2ad9..76d70ecac 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java @@ -2,12 +2,14 @@ package com.czg; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSONObject; import com.czg.dto.req.*; import com.czg.dto.resp.*; import com.czg.exception.CzgException; import com.czg.third.alipay.AlipayEntryManager; import com.czg.third.alipay.AlipayIsvEntryManager; import com.czg.third.wechat.WechatEntryManager; +import com.czg.third.wechat.dto.req.entry.business.sales.WechatEntryStoreInfoReqDto; import com.czg.utils.AssertUtil; import com.czg.utils.AsyncTaskExecutor; import org.jetbrains.annotations.NotNull; @@ -371,102 +373,121 @@ public class EntryManager { public static void main(String[] args) { - WechatBankBranchRespDto respDto = queryBankBranchList("1000009547", "931"); - System.out.println(respDto); +// WechatBankBranchRespDto respDto = queryBankBranchList("1000009547", "931"); +// System.out.println(respDto); -// AggregateMerchantDto merchantDto = getTestMerchantEntryData(); + AggregateMerchantDto merchantDto = getTestMerchantEntryData(); // -//// verifyEntryParam(merchantDto); -//// uploadParamImage(merchantDto); + verifyEntryParam(merchantDto); + uploadParamImage(merchantDto); // // verifyEntryParam(merchantDto); // uploadParamImage(merchantDto); //// System.out.println(merchantDto); -// entryMerchant(merchantDto, PayCst.Platform.WECHAT); + EntryRespDto respDto = entryMerchant(merchantDto, PayCst.Platform.WECHAT); // entryMerchant(merchantDto, PayCst.Platform.ALIPAY); // entryMerchant(merchantDto, PayCst.Platform.WECHAT, PayCst.Platform.ALIPAY); + System.out.println(respDto); } private static AggregateMerchantDto getTestMerchantEntryData() { AggregateMerchantDto merchantDto = new AggregateMerchantDto(); - merchantDto.setMerchantCode("20220106000000000001"); + merchantDto.setMerchantCode("CZG20260112151202011"); - MerchantBaseInfoDto baseInfoDto = new MerchantBaseInfoDto(); - baseInfoDto.setUserType("1"); - baseInfoDto.setCompanyChildType("1"); - baseInfoDto.setShortName("测试商户"); - baseInfoDto.setAlipayAccount("1157756119@qq.com"); - baseInfoDto.setMccCode("A0001_B0001"); - baseInfoDto.setContactPersonType(PayCst.ContactPersonType.SUPER); - baseInfoDto.setContactName("张三"); - baseInfoDto.setContactPersonId("110101199001011234"); - baseInfoDto.setContactPersonIdStartDate("2021-01-01"); - baseInfoDto.setContactPersonIdEndDate("2025-01-01"); - baseInfoDto.setContactPhone("13800000000"); - baseInfoDto.setContactEmail("1157756119@qq.com"); - baseInfoDto.setContactAddr("广东省深圳市南山区"); - baseInfoDto.setContactIdCardFrontPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - baseInfoDto.setContactIdCardBackPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - merchantDto.setMerchantBaseInfo(baseInfoDto); + String baseInfo = "{\"alipayAccount\":\"18191655977\",\"certType\":\"0\",\"companyChildType\":\"1\",\"contactAddr\":\"西安市沣东新城石化大道西段106号沣东科技园5号楼1层5-037室\",\"contactEmail\":\"892675422@qq.com\",\"contactIdCardBackPic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/ce731859ee644df8a4a46104b49c7696.png\",\"wechatId\":\"V1_S-iU_YpBpSKoSZFhQw3plh53G4PXHmNlhi1s88_VTk7A943tAxrkIcKErRcpFPkxG7vkMzhkT4ecN3IWxv71JwLJOzY9eQhmv6giwKWUAjk\"},\"contactIdCardFrontPic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/e0d259f9fbcf4897b7f93f3f7d1b8e9a.png\",\"wechatId\":\"V1_oYXFrsrx4sZqiHXURjDBMB53G4PXHmPB0jH4yl2JSowqJDinBqRYIZmHrRcpFPkxsGFO-6Ci3dGvLAs-X2g2DQLJOzY9eQhmv6giwKWUAjk\"},\"contactName\":\"\",\"contactPersonId\":\"612501199212187875\",\"contactPersonIdEndDate\":\"2039-02-01\",\"contactPersonIdStartDate\":\"2019-02-01\",\"contactPersonType\":\"LEGAL\",\"contactPhone\":\"18191655977\",\"mccCode\":\"A0001_B0001\",\"shortName\":\"菲慕斯博\",\"userType\":\"1\"}"; + merchantDto.setMerchantBaseInfo(JSONObject.parseObject(baseInfo, MerchantBaseInfoDto.class)); - BusinessLicenceInfoDto businessLicenceInfoDto = new BusinessLicenceInfoDto(); - businessLicenceInfoDto.setLicenceName("测试商户"); - businessLicenceInfoDto.setLicenceNo("110101199001011234"); - businessLicenceInfoDto.setLicenceStartDate("2021-01-01"); - businessLicenceInfoDto.setLicenceEndDate("2052-01-01"); - businessLicenceInfoDto.setRegisteredAddress("广东省深圳市南山区"); - businessLicenceInfoDto.setLicensePic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - merchantDto.setBusinessLicenceInfo(businessLicenceInfoDto); + String legalPersonInfo = "{\"idCardBackPic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/bb0f77b0b3404bbd9975a4f8497494df.png\",\"wechatId\":\"V1_Kt7wB6u_YhTp_V97CU_V_x53G4PXHmOeC1YpTSt8JenBIbhCzXjNIZWHrRcpFPkxHwsAu6WQfWU6BYJ3glMBnALJOzY9eQhmv6giwKWUAjk\"},\"idCardFrontPic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/196a6f37c5954fc395d621e5b0289cb5.png\",\"wechatId\":\"V1__G9UoJplQHSY_ychzdk7QR53G4PXHmMm845pnkw_19i0CeVtQ34dIbOHrRcpFPkxsIEMvoVq19SdOFHTsw6b3wLJOzY9eQhmv6giwKWUAjk\"},\"idCardHandPic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/eaa5e0f9352d4e77bbf5fa133ed54564.jpg\",\"wechatId\":\"V1_mWQpc12PTPL7P7kkdUOR6h53G4PXHmPbBEOZTTwh_KJ8RdecGr9kIZuGrRcpFPkx-jdQCaZuUWIQRmxr8pm-7QLJOzY9eQhmv6giwKWUAjk\"},\"legalAddress\":\"西安市沣东新城石化大道西段106号沣东科技园5号楼1层5-037室\",\"legalGender\":\"0\",\"legalIdPersonStartDate\":\"2019-02-01\",\"legalPersonEmail\":\"892675422@qq.com\",\"legalPersonId\":\"612501199212187875\",\"legalPersonIdEndDate\":\"2039-02-01\",\"legalPersonName\":\"蔺佳佳\",\"legalPersonPhone\":\"18191655977\"}"; + merchantDto.setLegalPersonInfo(JSONObject.parseObject(legalPersonInfo, LegalPersonInfoDto.class)); - LegalPersonInfoDto legalPersonInfoDto = new LegalPersonInfoDto(); - legalPersonInfoDto.setLegalPersonName("张三"); - legalPersonInfoDto.setLegalPersonId("110101199001011234"); - legalPersonInfoDto.setLegalIdPersonStartDate("2021-01-01"); - legalPersonInfoDto.setLegalPersonIdEndDate("2055-01-01"); - legalPersonInfoDto.setLegalPersonPhone("13800000000"); - legalPersonInfoDto.setLegalPersonEmail("1157756119@qq.com"); - legalPersonInfoDto.setLegalGender("1"); - legalPersonInfoDto.setLegalAddress("广东省深圳市南山区"); - legalPersonInfoDto.setIdCardHandPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - legalPersonInfoDto.setIdCardFrontPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - legalPersonInfoDto.setIdCardBackPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - merchantDto.setLegalPersonInfo(legalPersonInfoDto); + String businessInfo = "{\"licenceEndDate\":\"2099-12-31\",\"licenceName\":\"西安菲慕斯博市场营销策划有限公司\",\"licenceNo\":\"91610131MA6TXACP28\",\"licenceStartDate\":\"2021-02-25\",\"licensePic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/81b60f3a25494c8586159a193389aa2d.jpg\",\"wechatId\":\"V1_-Vbealekn9NZb3mT37ggpB53G4PXHmNEw41rkFGHdR1KJkYqgc5QId-HrRcpFPkxJLlN6u4U4s24lzVyTVoxPgLJOzY9eQhmv6giwKWUAjk\"},\"registeredAddress\":\"陕西省西安市高新区科技路37号海星城市广场B座2002-080室\"}"; + merchantDto.setBusinessLicenceInfo(JSONObject.parseObject(businessInfo, BusinessLicenceInfoDto.class)); - StoreInfoDto storeInfoDto = new StoreInfoDto(); - storeInfoDto.setMercProvCode("440000"); - storeInfoDto.setMercCityCode("440300"); - storeInfoDto.setMercAreaCode("440303"); - storeInfoDto.setMercProv("广东省"); - storeInfoDto.setMercCity("深圳市"); - storeInfoDto.setMercArea("南山区"); - storeInfoDto.setBusinessAddress("广东省深圳市南山区"); - storeInfoDto.setInsidePic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - storeInfoDto.setDoorPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - storeInfoDto.setCashierDeskPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - merchantDto.setStoreInfo(storeInfoDto); + String storeInfo = "{\"businessAddress\":\"西安市沣东新城石化大道西段106号沣东科技园5号楼1层5-037室\",\"cashierDeskPic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/4e52859aac754670aaf9be1c923da827.jpg\",\"wechatId\":\"V1_qFmvcdaX1XSUmknkcwKzMh53G4PXHmNYVJzGUiEs-qE-2ERQMr6XIemErRcpFPkxyCyY2DFU5QIBiaW6WamZmwLJOzY9eQhmv6giwKWUAjk\"},\"doorPic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/2c207c6f4a764ad18e501ed10fbfad59.png\",\"wechatId\":\"V1_JPI6iQUmEXiUL2JogtdaJR53G4PXHmO3QpILvqWkLccmvi-vX4OJIdmBrRcpFPkxwNCa-m1w5XissHoA_ynwKQLJOzY9eQhmv6giwKWUAjk\"},\"insidePic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/394b4834698a47e9b75419a5fd7f7de7.jpg\",\"wechatId\":\"V1_djcTvjUKESKADtVCmtLqmR53G4PXHmOLw9uEV3te3o7OebPqjdklIdGBrRcpFPkxy6JbIGyYEZT6XatGXNQ2YQLJOzY9eQhmv6giwKWUAjk\"},\"mercArea\":\"雁塔区\",\"mercAreaCode\":\"610113\",\"mercCity\":\"西安市\",\"mercCityCode\":\"610100\",\"mercProv\":\"陕西省\",\"mercProvCode\":\"610000\"}"; + merchantDto.setStoreInfo(JSONObject.parseObject(storeInfo, StoreInfoDto.class)); - SettlementInfoDto settlementInfoDto = new SettlementInfoDto(); - settlementInfoDto.setSettlementType("1"); - settlementInfoDto.setSettlementCardType("21"); - settlementInfoDto.setSettlementName("张三"); - settlementInfoDto.setSettlementCardNo("110101199001011234"); - settlementInfoDto.setBankMobile("13800000000"); - settlementInfoDto.setOpenAccProvinceId("440000"); - settlementInfoDto.setOpenAccCityId("440300"); - settlementInfoDto.setOpenAccAreaId("440303"); - settlementInfoDto.setOpenAccProvince("广东省"); - settlementInfoDto.setOpenAccCity("深圳市"); - settlementInfoDto.setOpenAccArea("南山区"); - settlementInfoDto.setBankName("中国工商银行"); - settlementInfoDto.setBankInstId("ICBC"); - settlementInfoDto.setBankType("1"); - settlementInfoDto.setBankBranchName("广东省深圳市南山区"); - settlementInfoDto.setBankBranchCode("440300"); - settlementInfoDto.setBankCardFrontPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - settlementInfoDto.setBankCardBackPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - settlementInfoDto.setOpenAccountLicencePic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); - merchantDto.setSettlementInfo(settlementInfoDto); + String settlementInfo = "{\"bankBranchCode\":\"313791000427\",\"bankBranchName\":\"西安银行高新四路支行\",\"bankCardBackPic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/3f3bb30f89fd4441985808f4a451c9c7.jpg\",\"wechatId\":\"V1_KAo5J49VNaCiC7twEi6NfB53G4PXHmNqgVl38ZojoETk3a9m_ZLvIaeHrRcpFPkxmQ3bRK2ytADSD8Fe8v-mpALJOzY9eQhmv6giwKWUAjk\"},\"bankCardFrontPic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/413f9170ca1d4f0893e05fd72b5e2b0e.jpg\",\"wechatId\":\"V1_GNhNtE1UYUCeRAuLsxdimR53G4PXHmNn9A4-gDbYgq47MiHxjki-IarByRcpFPkxfqldVa9taQ7W5KtWL35ppwLJOzY9eQhmv6giwKWUAjk\"},\"bankInstId\":\"XAB\",\"bankMobile\":\"18191655977\",\"bankName\":\"其他银行\",\"bankType\":\"\",\"noLegalHandSettleAuthPic\":{\"alipayId\":\"\",\"url\":\"\",\"wechatId\":\"\"},\"noLegalId\":\"\",\"noLegalIdCardBackPic\":{\"alipayId\":\"\",\"url\":\"\",\"wechatId\":\"\"},\"noLegalIdCardFrontPic\":{\"alipayId\":\"\",\"url\":\"\",\"wechatId\":\"\"},\"noLegalName\":\"\",\"noLegalSettleAuthPic\":{\"alipayId\":\"\",\"url\":\"\",\"wechatId\":\"\"},\"openAccArea\":\"雁塔区\",\"openAccAreaId\":\"610113\",\"openAccCity\":\"西安市\",\"openAccCityId\":\"610100\",\"openAccProvince\":\"陕西省\",\"openAccProvinceId\":\"610000\",\"openAccountLicencePic\":{\"alipayId\":\"\",\"url\":\"https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/6e5dca0822f742649ecf1666f91ad1b3.jpg\",\"wechatId\":\"V1_1S62SpAFYecG5T-DC9ewHR53G4PXHmMA49fy0uVVk5j35lE5L5njIfSGrRcpFPkxU9Fm6P6bYLY3t010FYkmAQLJOzY9eQhmv6giwKWUAjk\"},\"settlementCardNo\":\"611011580000054186\",\"settlementCardType\":\"21\",\"settlementName\":\"西安菲慕斯博市场营销策划有限公司\",\"settlementType\":\"1\"}"; + merchantDto.setSettlementInfo(JSONObject.parseObject(settlementInfo, SettlementInfoDto.class)); + + +// merchantDto.setMerchantCode("20220106000000000001"); +// +// MerchantBaseInfoDto baseInfoDto = new MerchantBaseInfoDto(); +// baseInfoDto.setUserType("1"); +// baseInfoDto.setCompanyChildType("1"); +// baseInfoDto.setShortName("测试商户"); +// baseInfoDto.setAlipayAccount("1157756119@qq.com"); +// baseInfoDto.setMccCode("A0001_B0001"); +// baseInfoDto.setContactPersonType(PayCst.ContactPersonType.SUPER); +// baseInfoDto.setContactName("张三"); +// baseInfoDto.setContactPersonId("110101199001011234"); +// baseInfoDto.setContactPersonIdStartDate("2021-01-01"); +// baseInfoDto.setContactPersonIdEndDate("2025-01-01"); +// baseInfoDto.setContactPhone("13800000000"); +// baseInfoDto.setContactEmail("1157756119@qq.com"); +// baseInfoDto.setContactAddr("广东省深圳市南山区"); +// baseInfoDto.setContactIdCardFrontPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// baseInfoDto.setContactIdCardBackPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// merchantDto.setMerchantBaseInfo(baseInfoDto); +// +// BusinessLicenceInfoDto businessLicenceInfoDto = new BusinessLicenceInfoDto(); +// businessLicenceInfoDto.setLicenceName("测试商户"); +// businessLicenceInfoDto.setLicenceNo("110101199001011234"); +// businessLicenceInfoDto.setLicenceStartDate("2021-01-01"); +// businessLicenceInfoDto.setLicenceEndDate("2052-01-01"); +// businessLicenceInfoDto.setRegisteredAddress("广东省深圳市南山区"); +// businessLicenceInfoDto.setLicensePic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// merchantDto.setBusinessLicenceInfo(businessLicenceInfoDto); +// +// LegalPersonInfoDto legalPersonInfoDto = new LegalPersonInfoDto(); +// legalPersonInfoDto.setLegalPersonName("张三"); +// legalPersonInfoDto.setLegalPersonId("110101199001011234"); +// legalPersonInfoDto.setLegalIdPersonStartDate("2021-01-01"); +// legalPersonInfoDto.setLegalPersonIdEndDate("2055-01-01"); +// legalPersonInfoDto.setLegalPersonPhone("13800000000"); +// legalPersonInfoDto.setLegalPersonEmail("1157756119@qq.com"); +// legalPersonInfoDto.setLegalGender("1"); +// legalPersonInfoDto.setLegalAddress("广东省深圳市南山区"); +// legalPersonInfoDto.setIdCardHandPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// legalPersonInfoDto.setIdCardFrontPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// legalPersonInfoDto.setIdCardBackPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// merchantDto.setLegalPersonInfo(legalPersonInfoDto); +// +// StoreInfoDto storeInfoDto = new StoreInfoDto(); +// storeInfoDto.setMercProvCode("440000"); +// storeInfoDto.setMercCityCode("440300"); +// storeInfoDto.setMercAreaCode("440303"); +// storeInfoDto.setMercProv("广东省"); +// storeInfoDto.setMercCity("深圳市"); +// storeInfoDto.setMercArea("南山区"); +// storeInfoDto.setBusinessAddress("广东省深圳市南山区"); +// storeInfoDto.setInsidePic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// storeInfoDto.setDoorPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// storeInfoDto.setCashierDeskPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// merchantDto.setStoreInfo(storeInfoDto); +// +// SettlementInfoDto settlementInfoDto = new SettlementInfoDto(); +// settlementInfoDto.setSettlementType("1"); +// settlementInfoDto.setSettlementCardType("21"); +// settlementInfoDto.setSettlementName("张三"); +// settlementInfoDto.setSettlementCardNo("110101199001011234"); +// settlementInfoDto.setBankMobile("13800000000"); +// settlementInfoDto.setOpenAccProvinceId("440000"); +// settlementInfoDto.setOpenAccCityId("440300"); +// settlementInfoDto.setOpenAccAreaId("440303"); +// settlementInfoDto.setOpenAccProvince("广东省"); +// settlementInfoDto.setOpenAccCity("深圳市"); +// settlementInfoDto.setOpenAccArea("南山区"); +// settlementInfoDto.setBankName("中国工商银行"); +// settlementInfoDto.setBankInstId("ICBC"); +// settlementInfoDto.setBankType("1"); +// settlementInfoDto.setBankBranchName("广东省深圳市南山区"); +// settlementInfoDto.setBankBranchCode("440300"); +// settlementInfoDto.setBankCardFrontPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// settlementInfoDto.setBankCardBackPic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// settlementInfoDto.setOpenAccountLicencePic(new ImageDto("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg")); +// merchantDto.setSettlementInfo(settlementInfoDto); return merchantDto; } diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java index 2f9154d28..a848a1148 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java @@ -1,5 +1,6 @@ package com.czg.third.wechat; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONWriter; import com.czg.PayCst; @@ -55,15 +56,14 @@ public class WechatEntryManager { String resp = WechatReqUtils.getReq(configDto, "/v3/applyment4sub/applyment/applyment_id/" + applyId, Map.of()); JSONObject object = JSONObject.parseObject(resp); - JSONObject data = object.getJSONObject("data"); - if (data == null) { + if (resp.contains("message")) { log.error("微信查询进件状态失败：{}", resp); queryStatusResp.setFailReason(object.getString("message")); queryStatusResp.setStatus(PayCst.EntryStatus.REJECTED); return queryStatusResp; } log.info("微信查询进件状态：{}", resp); - WechatQueryStateResp stateResp = JSONObject.parseObject(data.toJSONString(), WechatQueryStateResp.class); + WechatQueryStateResp stateResp = JSONObject.parseObject(resp, WechatQueryStateResp.class); queryStatusResp.setApplyId(stateResp.getApplyId()); switch (stateResp.getApplyState()) { @@ -114,11 +114,10 @@ public class WechatEntryManager { String params = JSONObject.toJSONString(entryReqDto, JSONWriter.Feature.IgnoreEmpty); String respBody = WechatReqUtils.postReq(configDto, "/v3/applyment4sub/applyment/", params); JSONObject object = JSONObject.parseObject(respBody); - JSONObject data = object.getJSONObject("data"); log.info("微信进件结果：{}", respBody); - if (data != null) { + if (respBody.contains("applyment_id")) { respDto.setStatus(PayCst.EntryStatus.INIT); - respDto.setEntryId(data.getString("applyment_id")); + respDto.setEntryId(object.getString("applyment_id")); respDto.setErrorMsg(""); } else { respDto.setStatus(PayCst.EntryStatus.REJECTED); @@ -328,6 +327,7 @@ public class WechatEntryManager { WechatEntryBankAccountReqDto bankAccountReqInfo = new WechatEntryBankAccountReqDto(); bankAccountReqInfo.setBankAccountType("21".equals(settlementInfo.getSettlementCardType()) ? "BANK_ACCOUNT_TYPE_CORPORATE" : "BANK_ACCOUNT_TYPE_PERSONAL"); bankAccountReqInfo.setAccountName(encryptor.encrypt(settlementInfo.getSettlementName())); + bankAccountReqInfo.setBankAddressCode(settlementInfo.getOpenAccCityId()); bankAccountReqInfo.setAccountBank(settlementInfo.getBankName()); bankAccountReqInfo.setBankBranchId(settlementInfo.getBankBranchCode()); bankAccountReqInfo.setBankName(settlementInfo.getBankBranchName()); @@ -344,12 +344,15 @@ public class WechatEntryManager { int offset = 0; Integer limit = 100; - JSONObject resp = queryBankList(null, offset, limit); +// JSONObject resp = queryBankList(null, offset, limit); // queryProvinceList(null); // queryCityList(null, "28"); - queryBankBranchList(null, "1000009547", "931", offset, limit); +// queryBankBranchList(null, "1000009547", "931", offset, limit); // queryBankBranchList(null, "1000009561", "29", offset, limit); + queryBankBranchList(null, "1000005241", "29", offset, limit); + +// uploadImage(null, "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/ec5bafd00f96466fb3efe545a058f08b.png"); // queryProvinceList(dto); // queryCityList(dto, "28"); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/dto/req/entry/WechatEntryBankAccountReqDto.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/dto/req/entry/WechatEntryBankAccountReqDto.java index 948400189..ab84037a7 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/dto/req/entry/WechatEntryBankAccountReqDto.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/dto/req/entry/WechatEntryBankAccountReqDto.java @@ -35,6 +35,9 @@ public class WechatEntryBankAccountReqDto { @JSONField(name = "account_name") private String accountName; + @JSONField(name = "bank_address_code") + private String bankAddressCode; + /** * 【必填】 * 开户银行