更新

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

@@ -2,7 +2,7 @@ package com.zhongshu.payment.client.model;
 
 
 import com.github.microservice.models.type.PaymentType;
-import com.zhongshu.payment.client.types.RechargeState;
+import com.github.microservice.types.OrderState;
 import com.zhongshu.payment.client.types.TradeType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -39,7 +39,7 @@ public class RechargeRecordModel {
     private String outTradeNo;
 
     @Schema(name = "rechargeState", description = "订单状态")
-    private RechargeState rechargeState;
+    private OrderState rechargeState;
 
     @Schema(name = "tradeTime", description = "交易时间")
     private Long tradeTime;

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

@@ -1,7 +1,7 @@
 package com.zhongshu.payment.client.model.param;
 
 import com.github.microservice.models.type.PaymentType;
-import com.zhongshu.payment.client.types.RechargeState;
+import com.github.microservice.types.OrderState;
 import com.zhongshu.payment.client.types.TradeType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -32,7 +32,7 @@ public class RecordSearchParam {
     private PaymentType paymentType;
 
     @Schema(description = "支付状态")
-    private RechargeState rechargeState;
+    private OrderState rechargeState;
 
     @Schema(description = "交易类型")
     private TradeType tradeType;

PaymentClient/src/main/java/com/zhongshu/payment/client/types/RechargeState.java

@@ -1,38 +0,0 @@
-package com.zhongshu.payment.client.types;
-
-import lombok.Getter;
-
-/**
- * @author wjf
- * @date 2024/7/25
- */
-public enum RechargeState {
-
-    SUCCESS("支付成功"),
-    REFUND("转入退款"),
-    NOTPAY("未支付"),
-    RECHARGING("充值中"),
-    CLOSED("已关闭"),
-
-    REVOKED("：已撤销（付款码支付）"),
-    USERPAYING("用户支付中（付款码支付）"),
-    PAYERROR("支付失败(其他原因，如银行返回失败)"),
-
-    TakeReview("提现审核中"),
-    Taking("提现处理中"),
-    TakeSuccess("提现成功"),
-
-    TakeRefuse("提现审批不通过"),
-
-    TakeFail("提现失败"),
-
-
-    ;
-
-    @Getter
-    private String remark;
-
-    RechargeState(String remark) {
-        this.remark = remark;
-    }
-}

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

@@ -1,7 +1,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.RechargeState;
 import com.zhongshu.payment.client.types.TradeType;
 import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
 import com.zhongshu.payment.server.core.domain.wallet.Wallet;
@@ -20,9 +20,9 @@ public interface RechargeRecordDaoExtend {
 
     Page<RechargeRecord> pageRecord(Pageable pageable, RecordSearchParam param);
 
-    public Integer sumTotalByWalletId(String walletId, RechargeState RechargeState, TradeType tradeType, Long startTime, Long endTime);
+    public Integer sumTotalByWalletId(String walletId, OrderState RechargeState, TradeType tradeType, Long startTime, Long endTime);
 
-    List<RechargeRecord> listByState(RechargeState rechargeState);
+    List<RechargeRecord> listByState(OrderState rechargeState);
 
-    List<RechargeRecord> listTimeOut(RechargeState rechargeState);
+    List<RechargeRecord> listTimeOut(OrderState rechargeState);
 }

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

@@ -3,9 +3,9 @@ package com.zhongshu.payment.server.core.dao.impl;
 import ch.qos.logback.core.util.StringUtil;
 import cn.hutool.core.date.DateUtil;
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
+import com.github.microservice.types.OrderState;
 import com.zhongshu.payment.client.model.TotalStatisticsModel;
 import com.zhongshu.payment.client.model.param.RecordSearchParam;
-import com.zhongshu.payment.client.types.RechargeState;
 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;
@@ -106,7 +106,7 @@ public class RechargeRecordDaoImpl implements RechargeRecordDaoExtend {
         return dbHelper.pages(query, pageable, RechargeRecord.class);
     }
 
-    public Integer sumTotalByWalletId(String walletId, RechargeState rechargeState, TradeType tradeType, Long startTime, Long endTime){
+    public Integer sumTotalByWalletId(String walletId, OrderState rechargeState, TradeType tradeType, Long startTime, Long endTime){
         Criteria criteria = new  Criteria();
 
         if (StringUtil.isNullOrEmpty(walletId)){
@@ -149,7 +149,7 @@ public class RechargeRecordDaoImpl implements RechargeRecordDaoExtend {
     }
 
     @Override
-    public List<RechargeRecord> listByState(RechargeState rechargeState) {
+    public List<RechargeRecord> listByState(OrderState rechargeState) {
         Criteria criteria = new  Criteria();
 
         if (rechargeState!=null){
@@ -161,7 +161,7 @@ public class RechargeRecordDaoImpl implements RechargeRecordDaoExtend {
     }
 
     @Override
-    public List<RechargeRecord> listTimeOut(RechargeState rechargeState) {
+    public List<RechargeRecord> listTimeOut(OrderState rechargeState) {
         Criteria criteria = new  Criteria();
 
         if (rechargeState!=null){

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

@@ -2,11 +2,11 @@ package com.zhongshu.payment.server.core.domain.wallet;
 
 import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
 import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.payment.client.model.PrePayModel;
 import com.zhongshu.payment.client.model.TransferModel;
-import com.zhongshu.payment.client.types.RechargeState;
 import com.zhongshu.payment.client.types.TradeType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -68,7 +68,7 @@ public class RechargeRecord extends SuperEntity {
 
     @Schema(name = "rechargeState", description = "订单状态，未支付、支付成功 ...")
     @Indexed
-    private RechargeState rechargeState;
+    private OrderState rechargeState;
 
     @Schema(name = "amount", description = "订单金额，单位分")
     private BigDecimal total = BigDecimal.ZERO;

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

@@ -5,6 +5,7 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.core.helper.ApplicationContextHolder;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
+import com.github.microservice.types.OrderState;
 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;
@@ -22,7 +23,6 @@ import com.zhongshu.payment.client.model.param.OrderParam;
 import com.zhongshu.payment.client.model.param.RechargeParam;
 import com.zhongshu.payment.client.payModel.commn.ClosePayOrderParam;
 import com.zhongshu.payment.client.payModel.commn.PayNotifyParam;
-import com.zhongshu.payment.client.types.RechargeState;
 import com.zhongshu.payment.client.types.TradeType;
 import com.zhongshu.payment.client.types.WalletState;
 import com.zhongshu.payment.client.types.WalletType;
@@ -132,7 +132,7 @@ public class RechargeService extends SuperService {
             return ResultContent.buildFail("获取用户信息失败");
         }
         rechargeRecord.setUserInfo(orgUserDetail.getContent());
-        rechargeRecord.setRechargeState(RechargeState.NOTPAY);
+        rechargeRecord.setRechargeState(OrderState.NOTPAY);
         rechargeRecord.setWallet(userWallet);
         long createTIme = System.currentTimeMillis();
         rechargeRecord.setCreateTime(createTIme);
@@ -154,12 +154,12 @@ public class RechargeService extends SuperService {
             return ResultContent.buildFail("充值订单:" + param.getOutTradeNo() + "不存在");
         }
         // 检查订单状态
-        RechargeState rechargeState = record.getRechargeState();
-        if (rechargeState != RechargeState.NOTPAY) {
-            return ResultContent.buildFail(String.format("订单状态不为:%s", RechargeState.NOTPAY.getRemark()));
+        OrderState rechargeState = record.getRechargeState();
+        if (rechargeState != OrderState.NOTPAY) {
+            return ResultContent.buildFail(String.format("订单状态不为:%s", OrderState.NOTPAY.getRemark()));
         }
         if (record.getExpireTime() <= System.currentTimeMillis()) {
-            record.setRechargeState(RechargeState.CLOSED);
+            record.setRechargeState(OrderState.CLOSED);
             rechargeRecordDao.save(record);
             return ResultContent.buildFail("订单支付过期，已关闭");
         }
@@ -210,8 +210,8 @@ public class RechargeService extends SuperService {
         if (record == null) {
             return ResultContent.buildFail("充值订单:" + outTradeNo + "不存在");
         }
-        if (record.getRechargeState().equals(RechargeState.NOTPAY) && !record.isCommit()) {
-            return ResultContent.buildSuccess(RechargeState.NOTPAY.name());
+        if (record.getRechargeState().equals(OrderState.NOTPAY) && !record.isCommit()) {
+            return ResultContent.buildSuccess(OrderState.NOTPAY.name());
         }
 
         ProjectWxPayParam wxPayParam = new ProjectWxPayParam();
@@ -237,7 +237,7 @@ public class RechargeService extends SuperService {
             return ResultContent.buildFail("充值订单:" + outTradeNo + "不存在");
         }
         // 判断状态
-        if (record.getRechargeState() != RechargeState.NOTPAY) {
+        if (record.getRechargeState() != OrderState.NOTPAY) {
             return ResultContent.buildFail(String.format("订单状态不为[%s]不能关闭"));
         }
         ExecuteMethodInfo executeMethodInfo = executeMethodInfoDao.findTopByPaymentType(record.getPaymentType());
@@ -249,7 +249,7 @@ public class RechargeService extends SuperService {
         if (resultContent.isFailed()) {
             return resultContent;
         }
-        record.setRechargeState(RechargeState.CLOSED);
+        record.setRechargeState(OrderState.CLOSED);
         rechargeRecordDao.save(record);
         return ResultContent.buildSuccess();
     }
@@ -259,10 +259,10 @@ public class RechargeService extends SuperService {
         if (record == null) {
             return ResultContent.buildFail("充值订单:" + outTradeNo + "不存在");
         }
-        if (!record.getRechargeState().equals(RechargeState.NOTPAY)) {
+        if (!record.getRechargeState().equals(OrderState.NOTPAY)) {
             return ResultContent.buildSuccess("订单状态不是未支付");
         }
-        record.setRechargeState(RechargeState.CLOSED);
+        record.setRechargeState(OrderState.CLOSED);
         rechargeRecordDao.save(record);
         return ResultContent.buildSuccess();
     }
@@ -283,8 +283,8 @@ public class RechargeService extends SuperService {
         // 查询钱包的充值记录
         List<RechargeRecord> list = rechargeRecordDao.ListByWallet(wallet, monthStartTime, monthEndTime);
 
-        Integer chargeTotal = rechargeRecordDao.sumTotalByWalletId(walletId, RechargeState.SUCCESS, TradeType.Charge, monthStartTime, monthEndTime);
-        Integer transferTotal = rechargeRecordDao.sumTotalByWalletId(walletId, RechargeState.TakeSuccess, TradeType.Take, monthStartTime, monthEndTime);
+        Integer chargeTotal = rechargeRecordDao.sumTotalByWalletId(walletId, OrderState.SUCCESS, TradeType.Charge, monthStartTime, monthEndTime);
+        Integer transferTotal = rechargeRecordDao.sumTotalByWalletId(walletId, OrderState.TakeSuccess, TradeType.Take, monthStartTime, monthEndTime);
 
         return ResultContent.buildSuccess(Map.of("list", list.stream().map(this::toModel).toList(), "chargeTotal", chargeTotal, "transferTotal", transferTotal));
     }

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

@@ -1,6 +1,7 @@
 package com.zhongshu.payment.server.core.service;
 
 import com.github.microservice.auth.security.helper.AuthHelper;
+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;
@@ -15,7 +16,6 @@ import com.zhongshu.payment.client.model.param.ExamineParam;
 import com.zhongshu.payment.client.model.param.RechargeParam;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.client.types.DataState;
-import com.zhongshu.payment.client.types.RechargeState;
 import com.zhongshu.payment.client.types.TradeType;
 import com.zhongshu.payment.client.types.WalletType;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
@@ -105,7 +105,7 @@ public class TransferService {
         rechargeRecord.setTotal(BigDecimal.valueOf(param.getTotal()));
         rechargeRecord.setOid(userWallet.getOid());
         rechargeRecord.setTradeType(TradeType.Take);
-        rechargeRecord.setRechargeState(RechargeState.Taking);
+        rechargeRecord.setRechargeState(OrderState.Taking);
         rechargeRecord.setWallet(userWallet);
         rechargeRecord.setUserId(userId);
         rechargeRecord.setId(CommonUtil.UUID());
@@ -142,16 +142,16 @@ public class TransferService {
         BeanUtils.copyProperties(initiateBatchTransferResponse, transferModel);
         rechargeRecord.setTransferModel(transferModel);
         if (initiateBatchTransferResponse.getBatchStatus().equals("ACCEPTED")) {
-            rechargeRecord.setRechargeState(RechargeState.Taking);
+            rechargeRecord.setRechargeState(OrderState.Taking);
         }
         if (initiateBatchTransferResponse.getBatchStatus().equals("PROCESSING")) {
-            rechargeRecord.setRechargeState(RechargeState.Taking);
+            rechargeRecord.setRechargeState(OrderState.Taking);
         }
         if (initiateBatchTransferResponse.getBatchStatus().equals("FINISHED")) {
-            rechargeRecord.setRechargeState(RechargeState.TakeSuccess);
+            rechargeRecord.setRechargeState(OrderState.TakeSuccess);
         }
         if (initiateBatchTransferResponse.getBatchStatus().equals("CLOSED")) {
-            rechargeRecord.setRechargeState(RechargeState.CLOSED);
+            rechargeRecord.setRechargeState(OrderState.CLOSED);
             return ResultContent.buildFail("该订单已关闭");
         }
 
@@ -203,7 +203,7 @@ public class TransferService {
         rechargeRecord.setTotal(BigDecimal.valueOf(param.getTotal()));
         rechargeRecord.setOid(userWallet.getOid());
         rechargeRecord.setTradeType(TradeType.Take);
-        rechargeRecord.setRechargeState(RechargeState.TakeReview);
+        rechargeRecord.setRechargeState(OrderState.TakeReview);
         rechargeRecord.setWallet(userWallet);
         rechargeRecord.setUserId(userId);
         rechargeRecord.setOpenid(param.getOpenid());
@@ -274,13 +274,13 @@ public class TransferService {
 //            record.setRechargeState(RechargeState.RECHARGING);
         }
         if (initiateBatchTransferResponse.getBatchStatus().equals("PROCESSING")) {
-            record.setRechargeState(RechargeState.Taking);
+            record.setRechargeState(OrderState.Taking);
         }
         if (initiateBatchTransferResponse.getBatchStatus().equals("FINISHED")) {
-            record.setRechargeState(RechargeState.TakeSuccess);
+            record.setRechargeState(OrderState.TakeSuccess);
         }
         if (initiateBatchTransferResponse.getBatchStatus().equals("CLOSED")) {
-            record.setRechargeState(RechargeState.CLOSED);
+            record.setRechargeState(OrderState.CLOSED);
         }
         rechargeRecordDao.save(record);
         return ResultContent.buildSuccess(record);
@@ -292,7 +292,7 @@ public class TransferService {
         if (record == null) {
             return ResultContent.buildFail("充值订单:" + param.getOutTradeNo() + "不存在");
         }
-        record.setRechargeState(RechargeState.TakeRefuse);
+        record.setRechargeState(OrderState.TakeRefuse);
         record.setRemark(param.getRemark());
         rechargeRecordDao.save(record);
 
@@ -322,24 +322,24 @@ public class TransferService {
         request.setOutDetailNo(record.getOutTradeNo());
         TransferDetailEntity transferDetailByOutNo = wxTransferBatchService.getTransferDetailByOutNo(request, configResult.getContent());
         if (transferDetailByOutNo.getDetailStatus().equals("INIT")) {
-            record.setRechargeState(RechargeState.Taking);
+            record.setRechargeState(OrderState.Taking);
             record.setRechargeStateDesc("系统转账校验中");
         }
         if (transferDetailByOutNo.getDetailStatus().equals("WAIT_PAY")) {
-            record.setRechargeState(RechargeState.Taking);
+            record.setRechargeState(OrderState.Taking);
             record.setRechargeStateDesc("待商户确认");
         }
 
         if (transferDetailByOutNo.getDetailStatus().equals("PROCESSING")) {
-            record.setRechargeState(RechargeState.Taking);
+            record.setRechargeState(OrderState.Taking);
             record.setRechargeStateDesc("正在处理中");
         }
         if (transferDetailByOutNo.getDetailStatus().equals("SUCCESS")) {
-            record.setRechargeState(RechargeState.TakeSuccess);
+            record.setRechargeState(OrderState.TakeSuccess);
             record.setRechargeStateDesc("提现成功");
         }
         if (transferDetailByOutNo.getDetailStatus().equals("FAIL")) {
-            record.setRechargeState(RechargeState.TakeFail);
+            record.setRechargeState(OrderState.TakeFail);
             record.setRechargeStateDesc(transferDetailByOutNo.getFailReason().name());
             AmountUpdateParam amountUpdateParam = new AmountUpdateParam();
             amountUpdateParam.setOutTradeNo(record.getOutTradeNo());

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

@@ -99,6 +99,7 @@ public class UnionNotifyService extends SuperService {
         SignNotifyModel notifyModel = JSONUtil.toBean(jsonObject, SignNotifyModel.class);
         contractNo = notifyModel.getContractNo();
 
+        // 签约状态
         String contractState = notifyModel.getContractState();
         // 签约信息
         UnionUserOpenInfo unionUserOpenInfo = unionUserOpenInfoDao.findTopByContractNo(contractNo);

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

@@ -4,8 +4,8 @@ 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.net.ResultContent;
+import com.github.microservice.types.OrderState;
 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.OrganizationSimpleModel;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
@@ -14,13 +14,9 @@ import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.feign.OrganizationFeignService;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.card.client.service.feign.UserFeignService;
-import com.zhongshu.card.client.type.LogsLevel;
-import com.zhongshu.card.client.type.MessageType;
 import com.zhongshu.payment.client.annotation.PayAnnotationService;
-import com.zhongshu.payment.client.model.RechargeRecordModel;
 import com.zhongshu.payment.client.model.WalletModel;
 import com.zhongshu.payment.client.model.WalletOrderModel;
-import com.zhongshu.payment.client.model.param.AmountUpdateParam;
 import com.zhongshu.payment.client.model.param.GetWalletParam;
 import com.zhongshu.payment.client.model.param.OrderParam;
 import com.zhongshu.payment.client.model.param.WalletQueryParam;
@@ -28,7 +24,6 @@ import com.zhongshu.payment.client.payModel.commn.ClosePayOrderParam;
 import com.zhongshu.payment.client.payModel.commn.CreateOrderParam;
 import com.zhongshu.payment.client.payModel.commn.PayNotifyParam;
 import com.zhongshu.payment.client.payModel.commn.PayOrderParam;
-import com.zhongshu.payment.client.types.RechargeState;
 import com.zhongshu.payment.client.types.TradeType;
 import com.zhongshu.payment.client.types.WalletState;
 import com.zhongshu.payment.client.types.WalletType;
@@ -53,7 +48,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
 
 /**
  * 钱包支付信息
@@ -153,7 +147,7 @@ public class WalletMainService extends SuperPayService {
             // 订单号（唯一）
             rechargeRecord.setOutTradeNo(outTradeNo);
             // 未支付状态
-            rechargeRecord.setRechargeState(RechargeState.NOTPAY);
+            rechargeRecord.setRechargeState(OrderState.NOTPAY);
             rechargeRecord.setDescription(param.getDescription());
             // 金额
             rechargeRecord.setTotal(total);
@@ -190,11 +184,11 @@ public class WalletMainService extends SuperPayService {
         if (rechargeRecord == null) {
             return ResultContent.buildFail(String.format("订单数据未找到", param.getOutTradeNo()));
         }
-        if (rechargeRecord.getRechargeState() != RechargeState.NOTPAY) {
+        if (rechargeRecord.getRechargeState() != OrderState.NOTPAY) {
             return ResultContent.buildFail(String.format("订单状态不为未支付状态：%s", rechargeRecord.getRechargeState().getRemark()));
         }
         if (rechargeRecord.getExpireTime() <= System.currentTimeMillis()) {
-            rechargeRecord.setRechargeState(RechargeState.CLOSED);
+            rechargeRecord.setRechargeState(OrderState.CLOSED);
             rechargeRecordDao.save(rechargeRecord);
             return ResultContent.buildFail("订单支付过期，已关闭");
         }

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

@@ -2,6 +2,7 @@ package com.zhongshu.payment.server.core.service.pay.impl.wxPaymentV3;
 
 import com.github.microservice.core.util.JsonUtil;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.types.OrderState;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.core.notification.NotificationConfig;
 import com.wechat.pay.java.core.notification.NotificationParser;
@@ -14,7 +15,6 @@ import com.zhongshu.card.client.service.feign.MqttFeignService;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.payment.client.model.param.AmountUpdateParam;
-import com.zhongshu.payment.client.types.RechargeState;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
 import com.zhongshu.payment.server.core.service.pay.impl.wallet.WalletFeignServiceImpl;
@@ -108,7 +108,7 @@ public class WxPayNotifyService {
             if (transaction.getTradeState().equals(Transaction.TradeStateEnum.SUCCESS)) {
                 //你的业务代码
                 log.info("微信支付成功");
-                record.setRechargeState(RechargeState.SUCCESS);
+                record.setRechargeState(OrderState.SUCCESS);
                 record.setTradeTime(DateUtils.timeToLong(transaction.getSuccessTime(), DateUtils.patternWx));
                 rechargeRecordDao.save(record);
 
@@ -125,7 +125,7 @@ public class WxPayNotifyService {
                 }
             } else {
                 log.info("微信支付异常：{}", transaction.getTradeState());
-                record.setRechargeState(RechargeState.valueOf(transaction.getTradeState().name()));
+                record.setRechargeState(OrderState.valueOf(transaction.getTradeState().name()));
                 rechargeRecordDao.save(record);
             }
 

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

@@ -2,6 +2,7 @@ package com.zhongshu.payment.server.core.service.pay.impl.wxPaymentV3;
 
 import com.github.microservice.models.type.PaymentType;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.types.OrderState;
 import com.wechat.pay.java.core.Config;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.core.exception.HttpException;
@@ -26,7 +27,6 @@ import com.zhongshu.payment.client.payModel.commn.ClosePayOrderParam;
 import com.zhongshu.payment.client.payModel.commn.CreateOrderParam;
 import com.zhongshu.payment.client.payModel.commn.PayNotifyParam;
 import com.zhongshu.payment.client.payModel.commn.PayOrderParam;
-import com.zhongshu.payment.client.types.RechargeState;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
 import com.zhongshu.payment.server.core.service.pay.SuperPayService;
@@ -116,7 +116,7 @@ public class WxPaymentMainService extends SuperPayService {
         }
         record.setOpenid(param.getOpenid());
         record.setPrePayModel(prepayResult.getContent());
-        record.setRechargeState(RechargeState.NOTPAY);
+        record.setRechargeState(OrderState.NOTPAY);
         record.setCommit(true);
         rechargeRecordDao.save(record);
         return prepayResult;

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

@@ -1,6 +1,5 @@
 package com.zhongshu.payment.server.core.timer;
 
-import com.zhongshu.payment.client.types.RechargeState;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
 import com.zhongshu.payment.server.core.service.RechargeService;