diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java index 11af69b..7f502d1 100644 --- a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java +++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java @@ -3,6 +3,7 @@ package cn.pluss.platform.controller.merchant; import cn.pluss.platform.api.Result; import cn.pluss.platform.api.ResultGenerator; import cn.pluss.platform.channel.MerchantAuditService; +import cn.pluss.platform.channel.ys.YSAuditServiceV3; import cn.pluss.platform.entity.MerchantChannelStatus; import cn.pluss.platform.exception.MsgException; import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService; @@ -28,6 +29,8 @@ public class MerchantChannelStatusController { @Autowired private MerchantAuditService ysAuditServiceV2; + @Autowired + private YSAuditServiceV3 ysAuditServiceV3; /** * 清理进件驳回信息中的通道数据 @@ -59,7 +62,7 @@ public class MerchantChannelStatusController { @ResponseBody public Result openOnlinePay(String merchantCode) { MerchantChannelStatus mcs = mcsService.getByMerchantCode(merchantCode, 4); - ((YsAuditServiceImpl) ysAuditServiceV2).openOnlinePay(mcs); + ((YsAuditServiceImpl) ysAuditServiceV3).openOnlinePay(mcs); return ResultGenerator.genSuccessResult("操作成功", null); } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/YSAuditServiceV3.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/YSAuditServiceV3.java index d6f7c56..927ca75 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/YSAuditServiceV3.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/YSAuditServiceV3.java @@ -22,4 +22,6 @@ public interface YSAuditServiceV3 { * @param userId */ void auditResult(String userId); + + void openOnlinePay(MerchantChannelStatus mcs); } 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 07280c7..a720342 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 @@ -76,8 +76,6 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer @Autowired private YsServiceV3 ysServiceV3; @Autowired - private YSAuditServiceV3 ysAuditServiceV3; - @Autowired private AccountService accountService; @Autowired private IdCardService idCardService; @@ -198,8 +196,8 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer rateFeeInfo.setWxPayFee(new RateFeeDetail("0", "0.38", "1")); rateFeeInfo.setBank1debitPayFee(new RateFeeDetail("0", "0.61", "1", "999900")); rateFeeInfo.setBank1creditPayFee(new RateFeeDetail("0", "0.61", "1", "999900")); - rateFeeInfo.setBank2debitPayFee(new RateFeeDetail("0", "0.38", "1", "999900")); - rateFeeInfo.setBank2creditPayFee(new RateFeeDetail("0", "0.38", "1")); + rateFeeInfo.setBank2debitPayFee(new RateFeeDetail("0", "0.60", "1", "999900")); + rateFeeInfo.setBank2creditPayFee(new RateFeeDetail("0", "0.60", "1")); RateFeeDetail codeScanD0Fee = new RateFeeDetail("0", "0.10", "1"); rateInfo.setCodeScanD0Fee(codeScanD0Fee); rateInfo.setCodeScanT1Fee(rateFeeInfo); @@ -230,23 +228,23 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer @Override public void callback(JSONObject callback) throws Exception { - String signContent = SignUtils.getSignContent(callback); - String signStr = callback.getString("sign"); - Sign sign = SecureUtil.sign(SignAlgorithm.SHA256withRSA, null, ysConfig.getOldPubKey()); - boolean verify; - - try { - verify = sign.verify(signContent.getBytes(StandardCharsets.UTF_8), Base64.decode(signStr)); - } catch (Exception e) { - log.info("回调验签异常"); - e.printStackTrace(); - verify = true; - } - - if (!verify) { - log.info("银盛云商服3.0回调验签失败"); - throw new MsgException("银盛云商服3.0回调验签失败"); - } +// String signContent = SignUtils.getSignContent(callback); +// String signStr = callback.getString("sign"); +// Sign sign = SecureUtil.sign(SignAlgorithm.SHA256withRSA, null, ysConfig.getOldPubKey()); +// boolean verify; +// +// try { +// verify = sign.verify(signContent.getBytes(StandardCharsets.UTF_8), Base64.decode(signStr)); +// } catch (Exception e) { +// log.info("回调验签异常"); +// e.printStackTrace(); +// verify = true; +// } +// +// if (!verify) { +// log.info("银盛云商服3.0回调验签失败"); +// throw new MsgException("银盛云商服3.0回调验签失败"); +// } String bizContent = callback.getString("bizContent"); Notify notifyData = JSON.parseObject(bizContent, Notify.class); @@ -750,6 +748,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer // } // } // } + @Override public void openOnlinePay(MerchantChannelStatus mcs) { try { JSONObject param = new JSONObject(); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java index 155b124..652a11c 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java @@ -7,7 +7,6 @@ import cn.pluss.platform.api.Result; import cn.pluss.platform.api.ResultGenerator; import cn.pluss.platform.channel.BaseMerchantAuditService; import cn.pluss.platform.channel.MerchantAuditService; -//import cn.pluss.platform.channel.ys.YSAuditServiceV3; import cn.pluss.platform.channel.ys.YSAuditServiceV3; import cn.pluss.platform.common.CommonRemarkService; import cn.pluss.platform.common.RiskBlacklistService; @@ -175,7 +174,7 @@ public class UserAppServiceImpl extends ServiceImpl impl @Autowired private UserRoleMapper userRoleMapper; - @Autowired + @Setter(onMethod_ = {@Autowired, @Qualifier("ysAuditServiceV3")}) private YSAuditServiceV3 ysAuditServiceV3; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/entity/CrpInfo.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/entity/CrpInfo.java index f641d2b..73cb826 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/entity/CrpInfo.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/entity/CrpInfo.java @@ -1,6 +1,5 @@ package cn.pluss.platform.ys.impl.v20220527.entity; -import com.alipay.api.domain.PersonInfo; import lombok.Getter; import lombok.Setter;