2

PaymentClient/pom.xml

@@ -62,6 +62,7 @@
 			<version>4.1.0</version>
 		</dependency>
 
+		<!--   配置工程	 -->
 		<dependency>
 			<groupId>com.zswl</groupId>
 			<artifactId>ConfigModel</artifactId>

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

@@ -3,7 +3,7 @@ package com.zhongshu.payment.server.core.controller;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.payment.client.model.param.GetWalletParam;
-import com.zhongshu.payment.server.core.service.pay.impl.wallet.WalletMainService;
+import com.zhongshu.payment.server.core.pay.impl.wallet.WalletMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/feign/OrderPayFeignController.java

@@ -1,8 +1,7 @@
 package com.zhongshu.payment.server.core.controller.feign;
 
 import com.github.microservice.core.delegate.DelegateMapping;
-import com.zhongshu.payment.client.service.OrderPayFeignService;
-import com.zhongshu.payment.client.service.WalletFeignService;
+import com.zhongshu.payment.client.pay.service.OrderPayFeignService;
 import io.swagger.v3.oas.annotations.Hidden;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/feign/WalletFeignController.java

@@ -1,7 +1,7 @@
 package com.zhongshu.payment.server.core.controller.feign;
 
 import com.github.microservice.core.delegate.DelegateMapping;
-import com.zhongshu.payment.client.service.WalletFeignService;
+import com.zhongshu.payment.client.pay.service.WalletFeignService;
 import io.swagger.v3.oas.annotations.Hidden;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -4,19 +4,11 @@ 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.card.client.model.payment.ExpenseFlowModel;
-import com.zhongshu.card.client.model.payment.ExpenseFlowSearch;
-import com.zhongshu.payment.client.payModel.commn.PayNotifyParam;
 import com.zhongshu.payment.client.payModel.cooperator.*;
-import com.zhongshu.payment.client.payModel.cooperator.platmatModel.ShopOpenWithDrawModel;
 import com.zhongshu.payment.client.payModel.cooperator.platmatModel.ShopWithDrawRecordModel;
 import com.zhongshu.payment.client.payModel.cooperator.platmatModel.ShopWithDrawRecordSearch;
-import com.zhongshu.payment.client.payModel.unionFrictionlessPay.model.UnionUserOpenInfoModel;
-import com.zhongshu.payment.client.payModel.unionFrictionlessPay.paymentModel.SignInParam;
-import com.zhongshu.payment.client.payModel.unionFrictionlessPay.paymentModel.UserRescissionParam;
-import com.zhongshu.payment.client.payModel.unionFrictionlessPay.paymentModel.UserSignQueryParam;
-import com.zhongshu.payment.server.core.service.pay.impl.unionFrictionlessPay.CooperatorService;
-import com.zhongshu.payment.server.core.service.pay.impl.unionFrictionlessPay.UnionFrictionlessPayMainService;
+import com.zhongshu.payment.server.core.pay.impl.unionFrictionlessPay.CooperatorService;
+import com.zhongshu.payment.server.core.pay.impl.unionFrictionlessPay.UnionFrictionlessPayMainService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -28,11 +20,9 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.MediaType;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 收钱吧提现

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

@@ -9,7 +9,7 @@ import com.zhongshu.payment.client.payModel.unionFrictionlessPay.paymentModel.Si
 import com.zhongshu.payment.client.payModel.unionFrictionlessPay.model.UnionUserOpenInfoModel;
 import com.zhongshu.payment.client.payModel.unionFrictionlessPay.paymentModel.UserRescissionParam;
 import com.zhongshu.payment.client.payModel.unionFrictionlessPay.paymentModel.UserSignQueryParam;
-import com.zhongshu.payment.server.core.service.pay.impl.unionFrictionlessPay.UnionFrictionlessPayMainService;
+import com.zhongshu.payment.server.core.pay.impl.unionFrictionlessPay.UnionFrictionlessPayMainService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/wxPaymentV3/WechatNotifyController.java

@@ -1,7 +1,6 @@
 package com.zhongshu.payment.server.core.controller.wxPaymentV3;
 
 import com.zhongshu.payment.server.core.service.RechargeService;
-import com.zhongshu.payment.server.core.service.pay.impl.wxPaymentV3.WxPayNotifyService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/wxPaymentV3/WechatPayV3Controller.java

@@ -5,7 +5,7 @@ import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.server.core.dataConfig.WxV3PayConfig;
-import com.zhongshu.payment.server.core.service.pay.impl.wxPaymentV3.WxPaymentMainService;
+import com.zhongshu.payment.server.core.pay.impl.wxPaymentV3.WxPaymentMainService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/ExecuteMethodInfoDao.java

@@ -2,7 +2,7 @@ package com.zhongshu.payment.server.core.dao;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.github.microservice.models.type.PaymentType;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.ExecuteMethodInfo;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ExecuteMethodInfo;
 
 /**
  * @author wjf

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/RechargeRecordDao.java

@@ -2,7 +2,7 @@ package com.zhongshu.payment.server.core.dao;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.zhongshu.payment.server.core.dao.extend.RechargeRecordDaoExtend;
-import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
+import com.zhongshu.payment.server.core.domain.pay.RechargeRecord;
 
 import java.util.List;
 

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/extend/RechargeRecordDaoExtend.java

@@ -3,7 +3,7 @@ package com.zhongshu.payment.server.core.dao.extend;
 import com.github.microservice.types.OrderState;
 import com.zhongshu.payment.client.model.param.RecordSearchParam;
 import com.zhongshu.payment.client.types.TradeType;
-import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
+import com.zhongshu.payment.server.core.domain.pay.RechargeRecord;
 import com.zhongshu.payment.server.core.domain.wallet.Wallet;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/impl/RechargeRecordDaoImpl.java

@@ -8,7 +8,7 @@ import com.zhongshu.payment.client.model.TotalStatisticsModel;
 import com.zhongshu.payment.client.model.param.RecordSearchParam;
 import com.zhongshu.payment.client.types.TradeType;
 import com.zhongshu.payment.server.core.dao.extend.RechargeRecordDaoExtend;
-import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
+import com.zhongshu.payment.server.core.domain.pay.RechargeRecord;
 import com.zhongshu.payment.server.core.domain.wallet.Wallet;
 import com.zhongshu.payment.server.core.utils.CommonUtil;
 import lombok.extern.slf4j.Slf4j;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/unionFrictionlessPay/ShopOpenWithDrawDao.java

@@ -1,11 +1,7 @@
 package com.zhongshu.payment.server.core.dao.unionFrictionlessPay;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
-import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.extend.UnionUserOpenInfoDaoExtend;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.ShopOpenWithDraw;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.UnionUserOpenInfo;
-
-import java.util.List;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ShopOpenWithDraw;
 
 /**
  *

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/unionFrictionlessPay/ShopWithDrawRecordDao.java

@@ -2,11 +2,7 @@ package com.zhongshu.payment.server.core.dao.unionFrictionlessPay;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.extend.ShopWithDrawRecordDaoExtend;
-import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.extend.UnionUserOpenInfoDaoExtend;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.ShopWithDrawRecord;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.UnionUserOpenInfo;
-
-import java.util.List;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ShopWithDrawRecord;
 
 /**
  * @author TRX

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/unionFrictionlessPay/UnionUserOpenInfoDao.java

@@ -2,7 +2,7 @@ package com.zhongshu.payment.server.core.dao.unionFrictionlessPay;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.extend.UnionUserOpenInfoDaoExtend;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.UnionUserOpenInfo;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.UnionUserOpenInfo;
 
 import java.util.List;
 

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/unionFrictionlessPay/extend/ShopWithDrawRecordDaoExtend.java

@@ -1,9 +1,7 @@
 package com.zhongshu.payment.server.core.dao.unionFrictionlessPay.extend;
 
 import com.zhongshu.payment.client.payModel.cooperator.platmatModel.ShopWithDrawRecordSearch;
-import com.zhongshu.payment.client.payModel.unionFrictionlessPay.model.UnionUserOpenInfoSearch;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.ShopWithDrawRecord;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.UnionUserOpenInfo;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ShopWithDrawRecord;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/unionFrictionlessPay/extend/UnionUserOpenInfoDaoExtend.java

@@ -1,7 +1,7 @@
 package com.zhongshu.payment.server.core.dao.unionFrictionlessPay.extend;
 
 import com.zhongshu.payment.client.payModel.unionFrictionlessPay.model.UnionUserOpenInfoSearch;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.UnionUserOpenInfo;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.UnionUserOpenInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/unionFrictionlessPay/impl/ShopWithDrawRecordDaoImpl.java

@@ -2,12 +2,9 @@ package com.zhongshu.payment.server.core.dao.unionFrictionlessPay.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.payment.client.payModel.cooperator.platmatModel.ShopWithDrawRecordSearch;
-import com.zhongshu.payment.client.payModel.unionFrictionlessPay.model.UnionUserOpenInfoSearch;
 import com.zhongshu.payment.server.core.dao.BaseImpl;
 import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.extend.ShopWithDrawRecordDaoExtend;
-import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.extend.UnionUserOpenInfoDaoExtend;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.ShopWithDrawRecord;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.UnionUserOpenInfo;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ShopWithDrawRecord;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/dao/unionFrictionlessPay/impl/UnionUserOpenInfoDaoImpl.java

@@ -4,7 +4,7 @@ import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.payment.server.core.dao.BaseImpl;
 import com.zhongshu.payment.client.payModel.unionFrictionlessPay.model.UnionUserOpenInfoSearch;
 import com.zhongshu.payment.server.core.dao.unionFrictionlessPay.extend.UnionUserOpenInfoDaoExtend;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.UnionUserOpenInfo;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.UnionUserOpenInfo;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -31,13 +31,13 @@ import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import com.zhongshu.payment.server.core.dao.WalletDao;
 import com.zhongshu.payment.server.core.dao.WxPayConfigDao;
 import com.zhongshu.payment.server.core.dataConfig.TimeConfig;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.ExecuteMethodInfo;
-import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ExecuteMethodInfo;
+import com.zhongshu.payment.server.core.domain.pay.RechargeRecord;
 import com.zhongshu.payment.server.core.domain.wallet.Wallet;
 import com.zhongshu.payment.server.core.service.base.SuperService;
-import com.zhongshu.payment.server.core.service.pay.impl.wallet.WalletFeignServiceImpl;
-import com.zhongshu.payment.server.core.service.pay.SuperPayService;
-import com.zhongshu.payment.server.core.service.pay.impl.wxPaymentV3.WxPaymentMainService;
+import com.zhongshu.payment.server.core.pay.impl.wallet.WalletFeignServiceImpl;
+import com.zhongshu.payment.server.core.pay.SuperPayService;
+import com.zhongshu.payment.server.core.pay.impl.wxPaymentV3.WxPaymentMainService;
 import com.zhongshu.payment.server.core.utils.CommonUtil;
 import com.zhongshu.payment.server.core.utils.wx.WechatCUtil;
 import jakarta.servlet.http.HttpServletRequest;

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

@@ -6,7 +6,7 @@ import com.zhongshu.payment.client.model.WalletModel;
 import com.zhongshu.payment.client.model.param.RecordSearchParam;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
-import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
+import com.zhongshu.payment.server.core.domain.pay.RechargeRecord;
 import com.zhongshu.payment.server.core.domain.wallet.Wallet;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

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

@@ -20,10 +20,10 @@ import com.zhongshu.payment.client.types.TradeType;
 import com.zhongshu.payment.client.types.WalletType;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import com.zhongshu.payment.server.core.dao.WalletDao;
-import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
+import com.zhongshu.payment.server.core.domain.pay.RechargeRecord;
 import com.zhongshu.payment.server.core.domain.wallet.Wallet;
-import com.zhongshu.payment.server.core.service.pay.impl.wallet.WalletFeignServiceImpl;
-import com.zhongshu.payment.server.core.service.pay.impl.wxPaymentV3.WxTransferBatchService;
+import com.zhongshu.payment.server.core.pay.impl.wallet.WalletFeignServiceImpl;
+import com.zhongshu.payment.server.core.pay.impl.wxPaymentV3.WxTransferBatchService;
 import com.zhongshu.payment.server.core.utils.CommonUtil;
 import io.netty.util.internal.StringUtil;
 import org.springframework.beans.BeanUtils;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/common/ScanExecuteService.java

@@ -3,7 +3,7 @@ package com.zhongshu.payment.server.core.service.common;
 import com.github.microservice.models.type.PaymentType;
 import com.zhongshu.payment.client.annotation.PayAnnotationService;
 import com.zhongshu.payment.server.core.dao.ExecuteMethodInfoDao;
-import com.zhongshu.payment.server.core.domain.unionFrictionlessPay.ExecuteMethodInfo;
+import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ExecuteMethodInfo;
 import com.zhongshu.payment.server.core.service.other.ScanSupport;
 import com.zhongshu.payment.server.core.utils.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -12,7 +12,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/timer/ComplexTimer.java

@@ -2,7 +2,7 @@ package com.zhongshu.payment.server.core.timer;
 
 import com.github.microservice.types.OrderState;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
-import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
+import com.zhongshu.payment.server.core.domain.pay.RechargeRecord;
 import com.zhongshu.payment.server.core.service.RechargeService;
 import com.zhongshu.payment.server.core.service.TransferService;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,18 +1,13 @@
 package com.zhongshu.payment.server.core.utils;
 
-import com.zhongshu.payment.server.core.service.pay.impl.unionFrictionlessPay.config.UnionPaymentConfig;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.crypto.engines.SM2Engine;
-import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.jce.ECNamedCurveTable;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
 
 import java.security.*;
 import java.security.spec.X509EncodedKeySpec;
-import java.util.Arrays;
 import java.util.Base64;
 
 /**
@@ -25,7 +20,7 @@ public class Test {
     @SneakyThrows
     public static void main(String[] args) {
         Security.addProvider(new BouncyCastleProvider());
-        
+
         // Generate key pair
         KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("EC", "BC");
         ECNamedCurveParameterSpec ecSpec = ECNamedCurveTable.getParameterSpec("sm2p256v1");