更新！11

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

@@ -4,7 +4,7 @@ import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
 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;
+import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.payment.client.model.PrePayModel;
 import com.zhongshu.payment.client.model.TransferModel;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/domain/wallet/Wallet.java

@@ -1,8 +1,6 @@
 package com.zhongshu.payment.server.core.domain.wallet;
 
 import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
-import com.zhongshu.card.client.model.org.OrganizationUserModel;
-import com.zhongshu.payment.client.types.DataState;
 import com.zhongshu.payment.client.types.WalletState;
 import com.zhongshu.payment.client.types.WalletType;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -19,7 +19,7 @@ import com.github.microservice.types.unionFrictionlessPayType.WithDrawOpenState;
 import com.github.microservice.types.unionFrictionlessPayType.WithDrawState;
 import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
-import com.zhongshu.card.client.model.org.OrganizationUserModel;
+import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.UserCountModel;
 import com.zhongshu.card.client.service.feign.OrganizationFeignService;
 import com.zhongshu.card.client.service.feign.UserFeignService;

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

@@ -8,7 +8,7 @@ import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
-import com.zhongshu.card.client.model.org.OrganizationUserModel;
+import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.UserCountModel;
 import com.zhongshu.card.client.model.paySetting.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.feign.OrganizationFeignService;

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

@@ -10,7 +10,7 @@ import com.wechat.pay.java.service.payments.model.Transaction;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.operLogs.OperationLogsAddParam;
 import com.zhongshu.card.client.model.org.OrgUserDetailParam;
-import com.zhongshu.card.client.model.org.OrganizationUserModel;
+import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.model.paySetting.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.feign.OperationLogsFeignService;
 import com.zhongshu.card.client.service.feign.OrganizationFeignService;

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

@@ -5,7 +5,7 @@ import com.github.microservice.types.OrderState;
 import com.wechat.pay.java.service.transferbatch.model.*;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.org.OrgUserDetailParam;
-import com.zhongshu.card.client.model.org.OrganizationUserModel;
+import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.model.paySetting.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.feign.OrganizationFeignService;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;

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

@@ -1,7 +1,7 @@
 package com.zhongshu.payment.server.core.utils;
 
 import com.github.microservice.core.util.net.IPUtil;
-import com.github.microservice.models.type.LogServiceType;
+import com.github.microservice.types.deviceUse.LogServiceType;
 import com.google.common.collect.Lists;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.j2se.MatrixToImageWriter;

PaymentServer/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 #Web服务器端口
 # 服务器上的端口是 9400 本地启动的端口是 9403
 server:
-  port: 9400
+  port: 9403
 
 debug: true
 

PaymentServer/src/main/resources/bootstrap.yml

@@ -8,7 +8,7 @@ spring:
     allow-circular-references: true
   # 应用名
   application:
-    name: ${project.artifactId}
+    name: ${project.artifactId}-trx
   # 当前读取配置文件的类型
   profiles:
     active: ${spring.profiles.active}