feat:pay

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

@@ -284,11 +284,18 @@ public class PayConvert {
 
 
   public static PayEvent convertEvent(PayRequest request, PayVO vo) {
   public static PayEvent convertEvent(PayRequest request, PayVO vo) {
     return PayEvent.builder()
     return PayEvent.builder()
+<<<<<<< Updated upstream
         .id(Long.parseLong(vo.getTransNo()))
         .id(Long.parseLong(vo.getTransNo()))
         .transNo(vo.getTransNo())
         .transNo(vo.getTransNo())
         .payState(vo.getPayState())
         .payState(vo.getPayState())
         .channelNo(vo.getChannelNo())
         .channelNo(vo.getChannelNo())
+=======
+        .id(Long.parseLong(request.getTransNo()))
+        .transNo(request.getTransNo())
+        .channelNo(request.getChannelNo())
+>>>>>>> Stashed changes
         .merchantId(request.getMerchantId())
         .merchantId(request.getMerchantId())
+        .payState(vo.getPayState())
         .thirdTransNo(vo.getThirdTransNo())
         .thirdTransNo(vo.getThirdTransNo())
         .failMsg(vo.getFailMsg())
         .failMsg(vo.getFailMsg())
         .finishTime(vo.getFinishTime())
         .finishTime(vo.getFinishTime())