1、blk代码调整

2、微信v3请求添加参数调整代码

zhywpt-app-settlew/src/main/java/cn/com/taiji/settlew/manager/issueOrder/IssueOrderRefundManagerImpl.java

@@ -151,6 +151,8 @@ public class IssueOrderRefundManagerImpl extends AbstractSettlewManager implemen
                     v3Request.setApiV3Key(payConfig.getWxApiv3key());
                     v3Request.setPrivateKey(payConfig.getWxKey());
                     v3Request.setSerialNo(payConfig.getWxSerialNo());
+                    v3Request.setPublicKey(payConfig.getWxPublicKey());
+                    v3Request.setPublicKeyId(payConfig.getWxPublicKeyId());
                     jsonPostRepeat(v3Request);
                 }else {
                     throw new ManagerException("微信支付版本异常！");

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/ats/OrderRefundWeChatQueryManagerImpl.java

@@ -82,6 +82,8 @@ public class OrderRefundWeChatQueryManagerImpl extends AbstractCommManager imple
                 v3Request.setApiV3Key(payConfig.getWxApiv3key());
                 v3Request.setPrivateKey(payConfig.getWxKey());
                 v3Request.setSerialNo(payConfig.getWxSerialNo());
+                v3Request.setPublicKey(payConfig.getWxPublicKey());
+                v3Request.setPublicKeyId(payConfig.getWxPublicKeyId());
                 AtsQueryRefundV3Response v3Response = null;
                 try {
                     v3Response = jsonPostRepeat(v3Request);

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardInManager.java

@@ -8,11 +8,13 @@ import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.log.BlsInterfaceLog;
 import cn.com.taiji.core.manager.comm.LogManager;
 import cn.com.taiji.core.model.comm.protocol.bls.*;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.core.repo.jpa.basic.*;
 import cn.com.taiji.core.repo.jpa.log.BlsInterfaceLogRepo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 
 import java.time.LocalDateTime;
@@ -29,6 +31,10 @@ public class BlackCardInManager extends AbstractManager implements LogManager<Ca
     public AbstractBlsResponse serviceHandle(CardInRequest request) throws ServiceHandleException {
         try {
             long begin = System.currentTimeMillis();
+            if (StringUtils.isEmpty(request.getOrgCode())){
+                throw GlyServiceError.NO_DATA_ERR.toHandleException("请求参数orgCode必填！");
+            }
+
             //发送 todo 这里调部中心接口处先不处理
 //        CardBlackUploadRequest request = new CardBlackUploadRequest();
 //        request.setStatus(1);//1-下黑

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuInManager.java

@@ -8,11 +8,13 @@ import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.log.BlsInterfaceLog;
 import cn.com.taiji.core.manager.comm.LogManager;
 import cn.com.taiji.core.model.comm.protocol.bls.*;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.core.repo.jpa.basic.*;
 import cn.com.taiji.core.repo.jpa.log.BlsInterfaceLogRepo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
 
@@ -29,6 +31,9 @@ public class BlackObuInManager extends AbstractManager implements LogManager<Obu
     public AbstractBlsResponse serviceHandle(ObuInRequest req) throws ServiceHandleException {
         try {
             long begin = System.currentTimeMillis();
+            if (StringUtils.isEmpty(req.getOrgCode())){
+                throw GlyServiceError.NO_DATA_ERR.toHandleException("请求参数orgCode必填！");
+            }
             //发送 todo 这里调部中心接口处先不处理
 
             //下黑