From 8873bff6e5d067e511962a0168b1fc00823a768b Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Tue, 6 May 2025 00:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E8=BF=9E=E8=B5=B7=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esign/service/EsignContractService.java | 8 ++++ .../impl/EsignContractServiceImpl.java | 39 ++++++++------- .../service/LklLedgerMemberService.java | 11 +++++ .../service/LklLedgerReceiverService.java | 3 +- .../service/impl/LakalaApiServiceImpl.java | 8 +++- .../impl/LklLedgerMemberServiceImpl.java | 47 +++++++++++++++++++ .../impl/LklLedgerReceiverServiceImpl.java | 12 ++++- .../lakala/service/impl/LklTkServiceImpl.java | 12 +++-- 8 files changed, 116 insertions(+), 24 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignContractService.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignContractService.java index 488f40f7..41b7afe1 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignContractService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignContractService.java @@ -26,6 +26,14 @@ public interface EsignContractService { */ CommonResult signFlowCreateByFile(String mchMobile); + /** + * 内部调用：发起合同签署流程 + * + * @param mchMobile + * @return + */ + Pair innerSignFlowCreateByFile(String mchMobile); + /** * 签署流程结束异步通知（由e签宝通知） * diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java index 8f585b7b..cbdebd77 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java @@ -159,28 +159,32 @@ public class EsignContractServiceImpl extends BaseServiceImpl ret = innerSignFlowCreateByFile(mchMobile); + if (!ret.getFirst()) { + return CommonResult.failed(ret.getSecond()); + } -// UserDto user = getCurrentUser(); -// if (!user.isAdmin()) { -// return CommonResult.failed("权限不足！"); -// } -// userId = user.getId().toString(); + return CommonResult.success(null, ret.getSecond()); + } + + @Override + public Pair innerSignFlowCreateByFile(String mchMobile) { + //String userId = "0"; if (StrUtil.isBlank(mchMobile)) { - return CommonResult.failed("缺少必要参数！"); + return Pair.of(false, "缺少必要参数！"); } EsignContract esignContract = getEsignContractByMchMobile(mchMobile); if (esignContract == null) { - return CommonResult.failed("未找到商家合同信息"); + return Pair.of(false, "未找到商家合同信息"); } // 检查商户入驻信息是否被审核通过 // 检查店铺是否已经申请过入驻 Integer apprStatus = shopMchEntryService.getApprovalStatus(mchMobile); if (!CommonConstant.MCH_APPR_STA_PASS.equals(apprStatus)) { - return CommonResult.failed("请先审核商家入驻信息"); + return Pair.of(false, "请先审核商家入驻信息"); } //"{\"docs\":[{\"fileId\":\"ab30d2c5600441f4a7daf512e4d69157\",\"fileName\":\"平台商户入驻合同协议.pdf\"}],\"signFlowConfig\":{\"signFlowTitle\":\"平台商户入驻合同协议\",\"signFlowExpireTime\":1746844718000,\"autoFinish\":true,\"notifyUrl\":\"https://mall.gpxscs.cn/asyn/notify\",\"redirectConfig\":{\"redirectUrl\":\"https://mall.gpxscs.cn/\"}},\"signers\":[{\"signConfig\":{\"signOrder\":1},\"noticeConfig\":{\"noticeTypes\":\"1\"},\"signerType\":0,\"psnSignerInfo\":{\"psnAccount\":\"13128997057\",\"psnInfo\":{\"psnName\":\"潘军杰\"}},\"signFields\":[{\"fileId\":\"ab30d2c5600441f4a7daf512e4d69157\",\"normalSignFieldConfig\":{\"signFieldStyle\":1,\"signFieldPosition\":{\"positionPage\":40,\"positionX\":472.3607,\"positionY\":277.19104}}},{\"fileId\":\"ab30d2c5600441f4a7daf512e4d69157\",\"normalSignFieldConfig\":{\"signFieldStyle\":1,\"signFieldPosition\":{\"positionPage\":5,\"positionX\":470.58798,\"positionY\":589.14496}}}]},{\"signConfig\":{\"signOrder\":2},\"noticeConfig\":{\"noticeTypes\":\"1\"},\"signerType\":1,\"orgSignerInfo\":{\"orgName\":\"桂平发发网络有限公司\",\"orgInfo\":{\"orgIDCardNum\":\"91450881MADEQ92533\",\"orgIDCardType\":\"CRED_ORG_USCC\"},\"transactorInfo\":{\"psnAccount\":\"17777525395\",\"psnInfo\":{\"psnName\":\"谢能坤\"}}},\"signFields\":[{\"fileId\":\"ab30d2c5600441f4a7daf512e4d69157\",\"normalSignFieldConfig\":{\"signFieldStyle\":1,\"signFieldPosition\":{\"positionPage\":2,\"positionX\":479.04996,\"positionY\":357.2327}}},{\"fileId\":\"ab30d2c5600441f4a7daf512e4d69157\",\"normalSignFieldConfig\":{\"signFieldStyle\":1,\"signFieldPosition\":{\"positionPage\":5,\"positionX\":255.96832,\"positionY\":588.4553}}}]}]}"; @@ -198,7 +202,7 @@ public class EsignContractServiceImpl extends BaseServiceImpl { + taskService.executeTask(() -> { + // 申请分账 + + // 新建一个正式的已审核通过的店铺 Pair retPair = shopStoreBaseService.merchEntryInfo2StoreInfo(esignContract.getMch_mobile()); if (retPair.getFirst() > 0) { // 更改合同记录表的店铺id diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklLedgerMemberService.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklLedgerMemberService.java index 29bfbda5..566090cf 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklLedgerMemberService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklLedgerMemberService.java @@ -54,4 +54,15 @@ public interface LklLedgerMemberService extends IBaseService { */ Boolean updateAuditResult(String applyId, String merInnerNo, String merCupNo, String entrustFileName, String entrustFilePath, String auditStatus, String auditStatusText, String remark); + /** + * 更新分账多个状态 + * + * @param merCupNo + * @param hasEsigned + * @param hasApplySplit + * @param hasReceiver + * @param hasBindReceiver + * @return + */ + Boolean updateMulStatus(String merCupNo, Integer hasEsigned, Integer hasApplySplit, Integer hasReceiver, Integer hasBindReceiver); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklLedgerReceiverService.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklLedgerReceiverService.java index 21075bb7..ec56d015 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklLedgerReceiverService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklLedgerReceiverService.java @@ -49,10 +49,11 @@ public interface LklLedgerReceiverService extends IBaseService updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("mer_cup_no", merCupNo); + if (hasEsigned != null && hasEsigned > 0) { + i++; + updateWrapper.set("has_esigned", hasEsigned); + } + if (hasApplySplit != null && hasApplySplit > 0) { + i++; + updateWrapper.set("has_apply_split", hasApplySplit); + } + if (hasReceiver != null && hasReceiver > 0) { + i++; + updateWrapper.set("has_receiver", hasReceiver); + } + if (hasBindReceiver != null && hasBindReceiver > 0) { + i++; + updateWrapper.set("has_bind_receiver", hasBindReceiver); + } + + if (i == 0) { + return false; + } + + return update(updateWrapper); + } } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklLedgerReceiverServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklLedgerReceiverServiceImpl.java index 518a981b..e3b329b3 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklLedgerReceiverServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklLedgerReceiverServiceImpl.java @@ -22,6 +22,7 @@ import com.suisung.mall.core.web.service.impl.BaseServiceImpl; import com.suisung.mall.shop.esign.service.EsignPlatformInfoService; import com.suisung.mall.shop.lakala.mapper.LklLedgerReceiverMapper; import com.suisung.mall.shop.lakala.service.LakalaApiService; +import com.suisung.mall.shop.lakala.service.LklLedgerMemberService; import com.suisung.mall.shop.lakala.service.LklLedgerReceiverService; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -40,6 +41,10 @@ public class LklLedgerReceiverServiceImpl extends BaseServiceImpl