feat:vo enum -> string

service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java

@@ -16,6 +16,7 @@ import com.jiejing.fitness.finance.service.pay.params.BrandMerchantRefundParams;
 import com.jiejing.fitness.finance.service.utils.FeeUtil;
 import com.jiejing.fitness.finance.service.utils.FeeUtil;
 import com.jiejing.fitness.finance.service.utils.MoneyUtil;
 import com.jiejing.fitness.finance.service.utils.MoneyUtil;
 import com.jiejing.paycenter.api.merchant.vo.MerchantVO;
 import com.jiejing.paycenter.api.merchant.vo.MerchantVO;
+import com.jiejing.paycenter.api.merchant.vo.SubChannelVO;
 import com.jiejing.paycenter.api.pay.request.PayRequest;
 import com.jiejing.paycenter.api.pay.request.PayRequest;
 import com.jiejing.paycenter.api.pay.request.RefundPayRequest;
 import com.jiejing.paycenter.api.pay.request.RefundPayRequest;
 import com.jiejing.paycenter.api.pay.vo.RefundVO;
 import com.jiejing.paycenter.api.pay.vo.RefundVO;
@@ -124,8 +125,8 @@ public class PayConvert {
       default:
       default:
         throw new BizException(FinanceErrorEnums.NOT_SUPPORT_TYPE);
         throw new BizException(FinanceErrorEnums.NOT_SUPPORT_TYPE);
     }
     }
-    SubChannelInfo subChannelInfo = merchant.getSubChannels().stream()
-        .filter(e -> scene == e.getOpenType())
+    SubChannelVO subChannelInfo = merchant.getSubChannels().stream()
+        .filter(e -> scene.name().equals(e.getOpenType()))
         .findFirst()
         .findFirst()
         .orElseThrow(() -> new BizException(FinanceErrorEnums.CHANNEL_NOT_OPEN));
         .orElseThrow(() -> new BizException(FinanceErrorEnums.CHANNEL_NOT_OPEN));
     return subChannelInfo.getFeeRate();
     return subChannelInfo.getFeeRate();
@@ -194,7 +195,7 @@ public class PayConvert {
   public static BrandCashierRecord convertRefund(BrandCashierRecord record, RefundVO vo) {
   public static BrandCashierRecord convertRefund(BrandCashierRecord record, RefundVO vo) {
     return BrandCashierRecord.builder()
     return BrandCashierRecord.builder()
         .id(record.getId())
         .id(record.getId())
-        .transState(convertTransState(vo.getRefundState()))
+        .transState(convertTransState(TransStateEnums.getByCode(vo.getRefundState())))
         .failMessage(vo.getFailMessage())
         .failMessage(vo.getFailMessage())
         .successTime(vo.getSuccessTime())
         .successTime(vo.getSuccessTime())
         .updateTime(new Date())
         .updateTime(new Date())

service/src/main/java/com/jiejing/fitness/finance/service/rpc/PayRpcService.java

@@ -27,7 +27,7 @@ public class PayRpcService {
       result.assertSuccess();
       result.assertSuccess();
       return result.getResult();
       return result.getResult();
     } catch (Exception e) {
     } catch (Exception e) {
-      return PayVO.builder().payState(PayStateEnums.FAILED).failMsg(e.getMessage()).build();
+      return PayVO.builder().payState(PayStateEnums.FAILED.name()).failMsg(e.getMessage()).build();
     }
     }
   }
   }
 
 
@@ -37,7 +37,7 @@ public class PayRpcService {
       result.assertSuccess();
       result.assertSuccess();
       return result.getResult();
       return result.getResult();
     } catch (Exception e) {
     } catch (Exception e) {
-      return RefundVO.builder().refundState(TransStateEnums.FAIL).failMessage(e.getMessage()).build();
+      return RefundVO.builder().refundState(TransStateEnums.FAIL.name()).failMessage(e.getMessage()).build();
     }
     }
   }
   }