更新！

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/unionFrictionlessPay/CooperatorController.java

@@ -4,7 +4,9 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.payment.client.payModel.cooperator.*;
+import com.zhongshu.payment.client.payModel.cooperator.ShopIdParam;
+import com.zhongshu.payment.client.payModel.cooperator.ShopProcessWithdrawParam;
+import com.zhongshu.payment.client.payModel.cooperator.WithDrawOpenParam;
 import com.zhongshu.payment.client.payModel.cooperator.platmatModel.ShopWithDrawRecordModel;
 import com.zhongshu.payment.client.payModel.cooperator.platmatModel.ShopWithDrawRecordSearch;
 import com.zhongshu.payment.server.core.pay.impl.unionFrictionlessPay.CooperatorService;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/OrderPayService.java

@@ -53,7 +53,7 @@ public class OrderPayService implements OrderPayFeignService {
         if (paymentType == null) {
             return ResultContent.buildFail("未指定支付方式");
         }
-        String serviceBeanName = paymentType.getServiceBeanName();
+        String serviceBeanName = "";
         Object beanObj = null;
         try {
             // 得到bean  首字母小写

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/SuperPayService.java

@@ -1,8 +1,6 @@
 package com.zhongshu.payment.server.core.pay;
 
 import com.github.microservice.auth.security.helper.AuthHelper;
-import com.github.microservice.core.util.net.IPUtil;
-import com.github.microservice.models.type.LogServiceType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.operLogs.OperationLogsAddParam;
 import com.zhongshu.payment.client.model.WalletModel;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/impl/unionFrictionlessPay/UnionFrictionlessPayMainService.java

@@ -6,13 +6,13 @@ import cn.hutool.json.JSONUtil;
 import com.github.microservice.app.stream.StreamHelper;
 import com.github.microservice.models.requestModel.SuperCooperatorResponseModel;
 import com.github.microservice.models.requestModel.SuperResponseModel;
-import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.stream.PaymentStreamType;
 import com.github.microservice.stream.model.OrderStateModel;
 import com.github.microservice.stream.model.SignModel;
 import com.github.microservice.types.OrderState;
 import com.github.microservice.types.RefundStatus;
+import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.types.unionFrictionlessPayType.ContractState;
 import com.github.microservice.types.unionFrictionlessPayType.UnionUserOpenType;
 import com.github.microservice.types.unionFrictionlessPayType.WithDrawOpenState;
@@ -51,16 +51,16 @@ import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.ShopOpenWithDra
 import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.ShopWithDrawRecordDao;
 import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.UnionUserOpenInfoDao;
 import com.zhongshu.payment.server.core.dataConfig.TimeConfig;
+import com.zhongshu.payment.server.core.domain.pay.RechargeRecord;
 import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ShopOpenWithDraw;
 import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ShopWithDrawRecord;
 import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.UnionUserOpenInfo;
-import com.zhongshu.payment.server.core.domain.pay.RechargeRecord;
-import com.zhongshu.payment.server.core.service.org.CollectionIdService;
 import com.zhongshu.payment.server.core.pay.impl.CommonPayService;
 import com.zhongshu.payment.server.core.pay.impl.unionFrictionlessPay.config.UnionFrictionlessPayApiConfig;
 import com.zhongshu.payment.server.core.pay.impl.unionFrictionlessPay.config.UnionFrictionlessPayConfig;
 import com.zhongshu.payment.server.core.pay.impl.unionFrictionlessPay.config.UnionPaymentConfig;
 import com.zhongshu.payment.server.core.pay.impl.unionFrictionlessPay.config.WithdrawConfig;
+import com.zhongshu.payment.server.core.service.org.CollectionIdService;
 import com.zhongshu.payment.server.core.utils.AesUtils;
 import com.zhongshu.payment.server.core.utils.CommonUtil;
 import jakarta.servlet.ServletInputStream;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/impl/wallet/WalletMainService.java

@@ -43,7 +43,6 @@ import com.zhongshu.payment.server.core.utils.CommonUtil;
 import groovy.util.logging.Slf4j;
 import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.ObjectUtils;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -282,7 +281,6 @@ public class WalletMainService extends WeChatWalletPayService {
         });
     }
 
-    @NotNull
     public Wallet findWallet(WalletQueryParam param) {
         String oid = param.getProjectOid();
         WalletType walletType = param.getWalletType();

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/impl/wxPaymentV3/WxPayNotifyService.java

@@ -22,7 +22,6 @@ import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.http.HttpServletRequest;
 import jline.internal.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -144,7 +143,7 @@ public class WxPayNotifyService {
         }
     }
 
-    @NotNull
+
     private WxPayConfigModel getWxPayConfigModelResultContent(String outTradeNo) {
         RechargeRecord recordByOutTradeNo = rechargeRecordDao.findByOutTradeNo(outTradeNo);
         ProjectWxPayParam wxPayParam = new ProjectWxPayParam();

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/base/CommonService.java

@@ -40,7 +40,7 @@ public class CommonService {
                 update.set(key, value);
             }
         });
-        UpdateResult updateResult = mongoTemplate.upsert(query, update, collectionName);
+        UpdateResult updateResult = mongoTemplate.updateMulti(query, update, collectionName);
         return updateResult.getUpsertedId();
     }
 
@@ -53,7 +53,7 @@ public class CommonService {
                 update.set(key, value);
             }
         });
-        UpdateResult updateResult = mongoTemplate.upsert(query, update, collectionName);
+        UpdateResult updateResult = mongoTemplate.updateMulti(query, update, collectionName);
         return updateResult.getUpsertedId();
     }
 
@@ -72,7 +72,7 @@ public class CommonService {
                 update.set(key, value);
             }
         });
-        UpdateResult updateResult = mongoTemplate.upsert(query, update, collectionName);
+        UpdateResult updateResult = mongoTemplate.updateMulti(query, update, collectionName);
         return updateResult.getUpsertedId();
     }
 

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/org/CollectionIdService.java

@@ -3,7 +3,6 @@ package com.zhongshu.payment.server.core.service.org;
 import com.zhongshu.payment.server.core.dao.CollectionIdDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/utils/Sm2Util.java

@@ -1,6 +1,5 @@
 package com.zhongshu.payment.server.core.utils;
 
-import org.aspectj.apache.bcel.classfile.Constant;
 import org.bouncycastle.asn1.gm.GMNamedCurves;
 import org.bouncycastle.asn1.gm.GMObjectIdentifiers;
 import org.bouncycastle.asn1.x9.X9ECParameters;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/utils/TestSM2.java

@@ -3,7 +3,6 @@ package com.zhongshu.payment.server.core.utils;
 import cn.hutool.crypto.SmUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StopWatch;