cs

PaymentClient/src/main/java/com/zhongshu/payment/client/annotation/PayAnnotationService.java

@@ -1,6 +1,6 @@
 package com.zhongshu.payment.client.annotation;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 
 import java.lang.annotation.*;
 

PaymentClient/src/main/java/com/zhongshu/payment/client/model/RechargeRecordModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.payment.client.model;
 
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.types.OrderState;
 import com.zhongshu.payment.client.types.TradeType;
 import io.swagger.v3.oas.annotations.media.Schema;

PaymentClient/src/main/java/com/zhongshu/payment/client/model/param/RechargeParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.payment.client.model.param;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

PaymentClient/src/main/java/com/zhongshu/payment/client/model/param/RecordSearchParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.payment.client.model.param;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.types.OrderState;
 import com.zhongshu.payment.client.types.TradeType;
 import io.swagger.v3.oas.annotations.media.Schema;

PaymentClient/src/main/java/com/zhongshu/payment/client/model/param/WalletQueryParam.java

@@ -1,6 +1,5 @@
 package com.zhongshu.payment.client.model.param;
 
-import com.github.microservice.models.type.PaymentType;
 import com.zhongshu.payment.client.types.WalletType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/commn/CreateOrderParam.java

@@ -1,6 +1,5 @@
 package com.zhongshu.payment.client.payModel.commn;
 
-import com.github.microservice.models.type.PaymentType;
 import com.github.microservice.pay.params.BasePayParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;

PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/CooperatorParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.payment.client.payModel.cooperator;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotEmpty;
@@ -9,8 +9,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.internal.build.AllowPrintStacktrace;
 
-import java.math.BigDecimal;
-
 /**
  * 提现参数
  *

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

@@ -1,11 +1,8 @@
 package com.zhongshu.payment.server.core.controller.test;
 
-import com.github.microservice.models.type.PaymentType;
 import com.github.microservice.net.ResultContent;
-import com.github.microservice.pay.params.BasePayParam;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
-import com.zhongshu.payment.server.core.pay.OrderPayService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.slf4j.Logger;

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

@@ -1,7 +1,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.github.microservice.types.payment.PaymentType;
 import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ExecuteMethodInfo;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.zhongshu.payment.server.core.domain.pay;
 
 import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.types.OrderState;
 import com.github.microservice.types.RefundStatus;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/domain/pay/unionFrictionlessPay/ExecuteMethodInfo.java

@@ -1,6 +1,6 @@
 package com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.payment.server.core.domain.base.SuperMain;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,9 +1,7 @@
 package com.zhongshu.payment.server.core.pay;
 
-import com.github.microservice.core.helper.ApplicationContextHolder;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.net.ResultContent;
-import com.github.microservice.net.ResultMessage;
 import com.github.microservice.pay.params.BasePayParam;
 import com.zhongshu.payment.client.pay.service.BasePayService;
 import com.zhongshu.payment.client.payModel.balance.BalanceModel;
@@ -11,10 +9,8 @@ import com.zhongshu.payment.client.payModel.balance.BalanceQueryParam;
 import com.zhongshu.payment.client.payModel.commn.CreateOrderParam;
 import com.zhongshu.payment.client.pay.service.OrderPayFeignService;
 import com.zhongshu.payment.server.core.dao.ExecuteMethodInfoDao;
-import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ExecuteMethodInfo;
 import com.zhongshu.payment.server.core.utils.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;

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

@@ -6,7 +6,7 @@ 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.models.type.PaymentType;
+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;

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

@@ -2,7 +2,7 @@ package com.zhongshu.payment.server.core.pay.impl.wallet;
 
 import ch.qos.logback.core.util.StringUtil;
 import com.github.microservice.auth.security.helper.AuthHelper;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;

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

@@ -1,6 +1,6 @@
 package com.zhongshu.payment.server.core.pay.impl.wxPaymentV3;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.OrderState;
 import com.wechat.pay.java.core.Config;

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

@@ -1,6 +1,6 @@
 package com.zhongshu.payment.server.core.service.common;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.payment.client.annotation.PayAnnotationService;
 import com.zhongshu.payment.server.core.dao.ExecuteMethodInfoDao;
 import com.zhongshu.payment.server.core.domain.pay.unionFrictionlessPay.ExecuteMethodInfo;