feat:pay

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

@@ -59,6 +59,7 @@ public class PayConvert {
     PayRequest request = JSON.parseObject(JSON.toJSONString(params), PayRequest.class);
     request.setAmount(params.getTransAmount());
     request.setTransNo(record.getTransNo());
+    request.setOrderNo(StringUtil.isBlank(record.getOrderNo()) ? record.getTransNo() : record.getOrderNo());
     request.setMerchantId(record.getMerchantId());
     request.setChannelNo(record.getChannelNo());
     request.setExtra(Optional.ofNullable(params.getExtra()).orElse(new JSONObject())
@@ -79,7 +80,7 @@ public class PayConvert {
     return StudioCashierRecord.builder()
         .id(id)
         .transNo(id.toString())
-        .orderNo(StringUtil.isBlank(params.getOrderNo()) ? id.toString() : params.getOrderNo())
+        .orderNo(StringUtil.isBlank(params.getOrderNo()) ? "" : params.getOrderNo())
         .businessNo(params.getBusinessNo())
         .subOrderNo(StringUtil.isBlank(params.getSubOrderNo()) ? "" : params.getSubOrderNo())
         .orderType(params.getOrderType().getCode())
@@ -284,16 +285,9 @@ public class PayConvert {
 
   public static PayEvent convertEvent(PayRequest request, PayVO vo) {
     return PayEvent.builder()
-<<<<<<< Updated upstream
-        .id(Long.parseLong(vo.getTransNo()))
-        .transNo(vo.getTransNo())
-        .payState(vo.getPayState())
-        .channelNo(vo.getChannelNo())
-=======
         .id(Long.parseLong(request.getTransNo()))
         .transNo(request.getTransNo())
         .channelNo(request.getChannelNo())
->>>>>>> Stashed changes
         .merchantId(request.getMerchantId())
         .payState(vo.getPayState())
         .thirdTransNo(vo.getThirdTransNo())