优化

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/UserOrderClient.java

@@ -108,13 +108,15 @@ public class UserOrderClient extends BaseController {
                                         userOrderRefundService.refundPaymentCallBack(data);
                                     }
                                 }, 60L, TimeUnit.SECONDS);
+                return res.getData().getResMsg();
             } catch (BizException e) {
-                log.error("回调业务异常，msg is {}", e.getMessage());
+                log.error("回调业务异常，data is {}, msg is {}", JSONObject.toJSONString(data), e.getMessage());
             } catch (Exception e) {
+                log.error("回调业务异常，data is {}", JSONObject.toJSONString(data));
                 e.printStackTrace();
             }
         }
-        return res.getData().getResMsg();
+        return null;
     }
 
     /***

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/PianoRoomSettingsController.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/pianoRoomSettings")
-@Api(value = "琴房时长价格配置", tags = "")
+@Api(value = "琴房时长价格配置", tags = "琴房时长价格配置")
 public class PianoRoomSettingsController extends BaseController {
 
     @Autowired

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/ali/OriginalAliAppTemplate.java

@@ -257,7 +257,7 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
                 //退款成功
                 RefundPaymentCallBack refundPayment = new RefundPaymentCallBack();
                 refundPayment.setBillNo(refundNo);
-                refundPayment.setTransNo(refundNo);
+                refundPayment.setTransNo(jsonParams.getString("trade_no"));
 
                 refundPayment.setRefundAmt(jsonParams.getString("refund_fee"));
                 refundPayment.setTradeTime(jsonParams.getDate("gmt_refund"));