Merge branch 'test' into 'master'

refund

See merge request !9

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -289,7 +289,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
                 break;
             case "unfilled":
-                kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);
+                String authId = ShiroUtils.getUserId().toString();
+                String authName = ShiroUtils.getLoginName();
+                kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse, authId, authName);
                 res = true;
                 break;
             case "refuse":

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -402,10 +402,7 @@ public class KylinRefundsStatusServiceImpl {
     }
 
     @Async
-    public void orderTicketRefundUnfilled(List<KylinOrderRefunds> refundList, String refuse) {
-        String authId = ShiroUtils.getUserId().toString();
-        String authName = ShiroUtils.getLoginName();
-
+    public void orderTicketRefundUnfilled(List<KylinOrderRefunds> refundList, String refuse, String authId, String authName) {
         KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
         kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_UNFILLED);
         kylinOrderRefunds.setExecutorId(authId);