Merge branch 'online' into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -1946,14 +1946,15 @@ DISCOUNT("畅学卡")
             if (Objects.isNull(refund)) {
                 continue;
             }
-            UserPaymentOrderWrapper.UserPaymentOrder paymentOrder = userPaymentOrderService.getUserPaymentOrderByOrderNo(refund.getOrderNo());
-            if (Objects.isNull(paymentOrder)) {
-                continue;
-            }
+
             // 查询退款状态
             // 查询订单退款状态
 
             try {
+                UserPaymentOrderWrapper.UserPaymentOrder paymentOrder = userPaymentOrderService.getUserPaymentOrderByOrderNo(refund.getOrderNo());
+                if (Objects.isNull(paymentOrder)) {
+                    continue;
+                }
                 RefundResp refundResp = paymentServiceContext.getPaymentService(paymentOrder.getPaymentVendor())
                         .queryRefund(userOrderRefundBill.getTransNo(), userOrderRefundBill.getBillNo(), paymentOrder.getOrderNo());
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -1315,7 +1315,7 @@
         values
         (#{item.musicSheetId},
         #{item.musicTagIds},#{item.paymentType},#{item.paymentType},
-        #{item.topFlag},#{item.exquisiteFlag},#{item.sortNo},0
+        #{item.topFlag},#{item.exquisiteFlag},#{item.sortNo},#{item.status}
         ,'PASS'
         ,#{item.musicSheetUpdate.name},
         #{item.musicSheetUpdate.subjectIds},