From 799285a6cdda8154317a752fe3fdbcc2c425ad0e Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Thu, 22 Feb 2024 11:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E7=9B=9B=E8=BF=9B=E4=BB=B6=E6=8A=A5?= =?UTF-8?q?=E5=A4=87appid=EF=BC=8C=E8=BF=9B=E4=BB=B6=E5=90=8E=E5=90=91php?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=BA=97=E9=93=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ZfbAttestationController.java | 32 ++++++++++++++++--- .../controller/merchant/WxController.java | 16 +++++----- .../cn/pluss/platform/enums/ZfbChannel.java | 2 +- .../channel/MercAuditListenerImpl.java | 2 ++ .../channel/ys/impl/YSAuditServiceV3.java | 12 +++---- .../platform/task/LklMerAuditHandler.java | 1 + .../platform/task/RyxMerAuditHandler.java | 2 ++ .../platform/task/SxfMerAuditHandler.java | 2 ++ .../platform/ys/impl/v20220527/ReqEntity.java | 4 +-- 9 files changed, 51 insertions(+), 22 deletions(-) diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/ZfbAttestationController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ZfbAttestationController.java index 14d94ea..51f534a 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/ZfbAttestationController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ZfbAttestationController.java @@ -9,7 +9,9 @@ import cn.pluss.platform.exception.MsgException; import cn.pluss.platform.mapper.AccountMapper; import cn.pluss.platform.merchant.AccountService; import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -39,11 +41,7 @@ public class ZfbAttestationController { @PostMapping public Result Attestation(@RequestBody Map params) { - QueryWrapper QueryWrapper = new QueryWrapper() - .eq("merchantCode", params.get("merchantCode")) - .eq("status", 3) - .ne("merchantId",""); - MerchantChannelStatus merchantCode = merchantChannelStatusService.getOne(QueryWrapper); + MerchantChannelStatus merchantCode = checkChannel(params.get("merchantCode")); if (merchantCode == null){ throw new MsgException("账号异常"); } @@ -80,4 +78,28 @@ public class ZfbAttestationController { } return ResultGenerator.genSuccessResult(merchantCodeMap); } + + + private MerchantChannelStatus checkChannel(String merchantCode){ + LambdaQueryWrapper qWrapper2 = Wrappers.lambdaQuery(); + qWrapper2.eq(MerchantChannelStatus::getMerchantCode, merchantCode) + .in(MerchantChannelStatus::getStatus, + MerchantChannelStatus.AUDIT_STATUS_SUCCESS, + MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT) + .orderByDesc(MerchantChannelStatus::getValid) + .orderByAsc(MerchantChannelStatus::getId) + .last("limit 1"); + MerchantChannelStatus mcs = merchantChannelStatusService.getOne(qWrapper2); + if (mcs != null) { + return mcs; + } + + LambdaQueryWrapper qWrapper = new LambdaQueryWrapper() + .eq(MerchantChannelStatus::getMerchantCode, merchantCode) + .orderByDesc(MerchantChannelStatus::getValid) + .orderByAsc(MerchantChannelStatus::getId) + .last("limit 1"); + + return merchantChannelStatusService.getOne(qWrapper); + } } diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxController.java index 42308a4..1123776 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxController.java @@ -198,14 +198,14 @@ public class WxController { // ysServiceV3.req(ReqMethod.Reporting, bizContentMap); // } // -// @PostMapping("/appIdAddOrUpdate") -// public void appIdAddOrUpdate(){ -// JSONObject bizContentMap = new JSONObject(); -// bizContentMap.put("channelId", "CUPS_WECHAT"); -// bizContentMap.put("mercId", "QRY230511483159"); -// bizContentMap.put("appletId", "wxc2bb94c0ddda1032"); -// ysServiceV3.req(ReqMethod.appIdAddOrUpdate, bizContentMap); -// } + @PostMapping("/appIdAddOrUpdate") + public void appIdAddOrUpdate(){ + JSONObject bizContentMap = new JSONObject(); + bizContentMap.put("channelId", "CUPS_WECHAT"); + bizContentMap.put("mercId", "QRY230510383416"); + bizContentMap.put("appletId", "wxfc7bd92a462eb191"); + ysServiceV3.req(ReqMethod.appIdAddOrUpdate, bizContentMap,4); + } // @PostMapping("/auditResult") // public void test(String sysFlowId){ diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/ZfbChannel.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/ZfbChannel.java index 4feb824..f2ff9c8 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/ZfbChannel.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/ZfbChannel.java @@ -9,7 +9,7 @@ import lombok.Getter; public enum ZfbChannel { SXF_CHANNEL("随行付","https://czg-oss.oss-cn-hangzhou.aliyuncs.com/app/statics/%E9%9A%8F%E8%A1%8C%E4%BB%98.png"), YS_CHANNEL("银盛","https://czg-oss.oss-cn-hangzhou.aliyuncs.com/app/statics/%E9%93%B6%E7%9B%9B.png"), - LKL_CHANNEL("拉卡拉","https://czg-oss.oss-cn-hangzhou.aliyuncs.com/app/statics/%E6%8B%89%E5%8D%A1%E6%8B%89.jpg"), + LKL_CHANNEL("拉卡拉","https://czg-oss.oss-cn-hangzhou.aliyuncs.com/app/statics/%E6%8B%89%E5%8D%A1%E6%8B%89%28%E6%94%AF%E4%BB%98%E5%AE%9D%29.jpg"), HF_CHANNEL("汇付", "https://czg-oss.oss-cn-hangzhou.aliyuncs.com/app/statics/%E6%B1%87%E4%BB%98.png"); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java index a86bd25..393fa1a 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java @@ -195,6 +195,8 @@ public class MercAuditListenerImpl implements MercAuditListener { sb.append("&mobile=").append(userInfo.getLoginName()); sb.append("&syb_m_id=").append(merchantStore.getId()); sb.append("&addressNo=").append(merchantBaseInfo.getAddressNo()); + sb.append("&merchantCode=").append(merchantBaseInfo.getMerchantCode()); + sb.append("&type=").append(1); String address = merchantBaseInfo.getProvince() + merchantBaseInfo.getCity() + merchantBaseInfo.getDistrict() + merchantBaseInfo.getAddress(); String area = merchantBaseInfo.getProvince() +"-"+ merchantBaseInfo.getCity() +"-"+ merchantBaseInfo.getDistrict(); try { diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java index a59dbe1..4b6cf59 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java @@ -752,12 +752,12 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer // mercAuditListener.onSuccess(mbi.getUserId(), mcs); //向小程序里加入商家 handler.createStore(mcs); -// //银盛再次报备 -// JSONObject bizContentMap = new JSONObject(); -// bizContentMap.put("channelId", "CUPS_WECHAT"); -// bizContentMap.put("mercId", mercId); -// bizContentMap.put("appletId", "wxc2bb94c0ddda1032"); -// ysServiceV3.req(ReqMethod.appIdAddOrUpdate, bizContentMap); +// //银盛再次报备 appid + JSONObject bizContentMap = new JSONObject(); + bizContentMap.put("channelId", "CUPS_WECHAT"); + bizContentMap.put("mercId", mercId); + bizContentMap.put("appletId", "wxfc7bd92a462eb191"); + ysServiceV3.req(ReqMethod.appIdAddOrUpdate, bizContentMap,channel); break; case YsConfigV3.STATUS_REFUSE: String note1 = authData.getNote(); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java index b13a6c5..5999cbf 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java @@ -386,6 +386,7 @@ public class LklMerAuditHandler { sb.append("&syb_m_id=").append(merchantStore.getId()); sb.append("&addressNo=").append(merchantBaseInfo.getAddressNo()); sb.append("&merchantCode=").append(merchantBaseInfo.getMerchantCode()); + sb.append("&type=").append(1); String address = merchantBaseInfo.getProvince() + merchantBaseInfo.getCity() + merchantBaseInfo.getDistrict() + merchantBaseInfo.getAddress(); String area = merchantBaseInfo.getProvince() + "-" + merchantBaseInfo.getCity() + "-" + merchantBaseInfo.getDistrict(); try { diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java index 418a7a7..f190afe 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java @@ -287,6 +287,8 @@ public class RyxMerAuditHandler { String address = merchantBaseInfo.getProvince() + merchantBaseInfo.getCity() + merchantBaseInfo.getDistrict() + merchantBaseInfo.getAddress(); String addressNo = merchantBaseInfo.getAddressNo(); sb.append("&addressNo=").append(addressNo); + sb.append("&merchantCode=").append(merchantBaseInfo.getMerchantCode()); + sb.append("&type=").append(1); String area = merchantBaseInfo.getProvince() +"-"+ merchantBaseInfo.getCity() +"-"+ merchantBaseInfo.getDistrict(); try { String decodeAddress = URLEncoder.encode(address, "UTF-8"); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java index 779cdf0..3fac538 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java @@ -376,6 +376,8 @@ public class SxfMerAuditHandler { sb.append("&mobile=").append(userInfo.getLoginName()); sb.append("&syb_m_id=").append(merchantStore.getId()); sb.append("&addressNo=").append(merchantBaseInfo.getAddressNo()); + sb.append("&merchantCode=").append(merchantBaseInfo.getMerchantCode()); + sb.append("&type=").append(1); String address = merchantBaseInfo.getProvince() + merchantBaseInfo.getCity() + merchantBaseInfo.getDistrict() + merchantBaseInfo.getAddress(); String area = merchantBaseInfo.getProvince() +"-"+ merchantBaseInfo.getCity() +"-"+ merchantBaseInfo.getDistrict(); try { diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/ReqEntity.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/ReqEntity.java index 418624d..65da17f 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/ReqEntity.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/ReqEntity.java @@ -38,7 +38,7 @@ public class ReqEntity { ReqEntity entity = new ReqEntity(); entity.timeStamp = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss"); entity.method = reqMethod.getMethod(); - entity.reqId = "SYB_" + RandomUtil.randomString(4) + DateUtil.format(date, "yyMMddHHmmss"); + entity.reqId = "YSK_" + RandomUtil.randomString(4) + DateUtil.format(date, "yyMMddHHmmss"); return entity; } @@ -48,7 +48,7 @@ public class ReqEntity { ReqEntity entity = new ReqEntity(); entity.timeStamp = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss"); entity.method = reqMethod.getMethod(); - entity.reqId = "SYB_" + RandomUtil.randomString(4) + DateUtil.format(date, "yyMMddHHmmss"); + entity.reqId = "YSK_" + RandomUtil.randomString(4) + DateUtil.format(date, "yyMMddHHmmss"); return entity; }