From 4faec74cda403623ce779e815533d491d0c05dbd Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Tue, 13 Jan 2026 15:56:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8F=90=E4=BA=A4=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/third/alipay/AlipayIsvEntryManager.java | 2 ++ .../java/com/czg/third/wechat/WechatEntryManager.java | 10 +++++----- .../business/sales/WechatEntryStoreInfoReqDto.java | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java index 1109bcac3..4be398118 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java @@ -115,6 +115,8 @@ public class AlipayIsvEntryManager { File shopScenePic = UploadFileUtil.getFileByUrl(reqDto.getStoreInfo().getInsidePic().getUrl()); File shopSignBoardPic = UploadFileUtil.getFileByUrl(reqDto.getStoreInfo().getDoorPic().getUrl()); + log.info("支付宝开启代商户签约: 请求={}", JSONObject.toJSONString(signModel)); + // 构造请求参数以调用接口 AlipayOpenAgentFacetofaceApi api = new AlipayOpenAgentFacetofaceApi(); Object response = api.sign(null, businessLicensePic, signModel, shopScenePic, shopSignBoardPic, null); 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 9328f3507..031513da1 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 @@ -247,7 +247,7 @@ public class WechatEntryManager { contactInfo.setContactIdDocCopy(baseInfo.getContactIdCardFrontPic().getWechatId()); contactInfo.setContactIdDocCopyBack(baseInfo.getContactIdCardBackPic().getWechatId()); contactInfo.setContactPeriodBegin(baseInfo.getContactPersonIdStartDate()); - contactInfo.setContactPeriodEnd(baseInfo.getContactPersonIdEndDate()); + contactInfo.setContactPeriodEnd(PayCst.LONG_TERM_DATE.equals(baseInfo.getContactPersonIdEndDate()) ? "长期" : baseInfo.getContactPersonIdEndDate()); contactInfo.setMobilePhone(encryptor.encrypt(baseInfo.getContactPhone())); contactInfo.setContactEmail(encryptor.encrypt(baseInfo.getContactEmail())); } else if (PayCst.ContactPersonType.LEGAL.equals(baseInfo.getContactPersonType())) { @@ -256,7 +256,7 @@ public class WechatEntryManager { contactInfo.setContactIdDocCopy(legalPersonInfo.getIdCardFrontPic().getWechatId()); contactInfo.setContactIdDocCopyBack(legalPersonInfo.getIdCardBackPic().getWechatId()); contactInfo.setContactPeriodBegin(legalPersonInfo.getLegalIdPersonStartDate()); - contactInfo.setContactPeriodEnd(legalPersonInfo.getLegalPersonIdEndDate()); + contactInfo.setContactPeriodEnd(PayCst.LONG_TERM_DATE.equals(legalPersonInfo.getLegalPersonIdEndDate()) ? "长期" : legalPersonInfo.getLegalPersonIdEndDate()); contactInfo.setMobilePhone(encryptor.encrypt(legalPersonInfo.getLegalPersonPhone())); contactInfo.setContactEmail(encryptor.encrypt(legalPersonInfo.getLegalPersonEmail())); } else { @@ -287,7 +287,7 @@ public class WechatEntryManager { licenseReqDto.setLegalPerson(legalPersonInfo.getLegalPersonName()); licenseReqDto.setLicenseAddress(businessLicenceInfo.getRegisteredAddress()); licenseReqDto.setPeriodBegin(businessLicenceInfo.getLicenceStartDate()); - licenseReqDto.setPeriodEnd(businessLicenceInfo.getLicenceEndDate()); + licenseReqDto.setPeriodEnd(PayCst.LONG_TERM_DATE.equals(businessLicenceInfo.getLicenceEndDate()) ? "长期" : businessLicenceInfo.getLicenceEndDate()); subjectInfo.setBusinessLicenseInfo(licenseReqDto); WechatEntryIdentityReqDto identityInfo = new WechatEntryIdentityReqDto(); identityInfo.setIdHolderType(PayCst.ContactPersonType.LEGAL); @@ -313,8 +313,8 @@ public class WechatEntryManager { bizStoreInfo.setBizStoreName(baseInfo.getShortName()); bizStoreInfo.setBizAddressCode(storeInfo.getMercAreaCode()); bizStoreInfo.setBizStoreAddress(storeInfo.getBusinessAddress()); - bizStoreInfo.setStoreEntrancePic(List.of(storeInfo.getDoorPic().getWechatId())); - bizStoreInfo.setIndoorPic(List.of(storeInfo.getInsidePic().getWechatId(), storeInfo.getCashierDeskPic().getWechatId())); + bizStoreInfo.setStoreEntrancePic(storeInfo.getDoorPic().getWechatId()); + bizStoreInfo.setIndoorPic(storeInfo.getInsidePic().getWechatId()); salesInfo.setBizStoreInfo(bizStoreInfo); WechatEntryMiniProgramReqDto miniProgramInfo = new WechatEntryMiniProgramReqDto(); miniProgramInfo.setMiniProgramAppid("wxd88fffa983758a30"); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/dto/req/entry/business/sales/WechatEntryStoreInfoReqDto.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/dto/req/entry/business/sales/WechatEntryStoreInfoReqDto.java index 2347f01ea..298741d7e 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/dto/req/entry/business/sales/WechatEntryStoreInfoReqDto.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/dto/req/entry/business/sales/WechatEntryStoreInfoReqDto.java @@ -55,7 +55,8 @@ public class WechatEntryStoreInfoReqDto { * 2、请填写通过图片上传API预先上传图片生成好的MediaID。 */ @JSONField(name = "store_entrance_pic") - private List storeEntrancePic; +// private List storeEntrancePic; + private String storeEntrancePic; /** * 【必填】 @@ -64,7 +65,8 @@ public class WechatEntryStoreInfoReqDto { * 2、请填写通过图片上传API预先上传图片生成好的MediaID。 */ @JSONField(name = "indoor_pic") - private List indoorPic; +// private List indoorPic; + private String indoorPic; /** * 【选填】