Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

@@ -82,7 +82,7 @@ public class KylinOrderRefundAdminController extends BaseController {
     @PostMapping("applyOrder")
     @ResponseBody
     public OrderDetailsAdminVo applyOrder(RefundApplyParam refundApplyParam) {
-        OrderDetailsAdminVo orderInfo = kylinOrderRefundsServiceImpl.orderDetails(refundApplyParam.getOrderTicketsId());
+        OrderDetailsAdminVo orderInfo = kylinOrderRefundsServiceImpl.orderDetails(refundApplyParam.getOrderCode());
         return orderInfo;
     }
 

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

@@ -312,21 +312,18 @@ public class KylinRefundsStatusServiceImpl {
             postResult = HttpUtil.post(applyUrl, params);
             JsonNode postResultNew = JsonUtils.fromJson(postResult, JsonNode.class);
             // 请求提审接口结果
-            if (postResultNew.get("message").toString() != "OK") {
-                KylinOrderRefunds kylinOrderRefundsErr = new KylinOrderRefunds();
+                /*KylinOrderRefunds kylinOrderRefundsErr = new KylinOrderRefunds();
                 kylinOrderRefundsErr.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR);
                 kylinOrderRefundsErr.setRefundError("通知退款中心失败");
                 kylinOrderRefundsErr.setRefundAt(LocalDateTime.now());
                 kylinOrderRefundsMapper.update(
                         kylinOrderRefundsErr,
                         new UpdateWrapper<KylinOrderRefunds>().eq("order_refunds_id", refund.getOrderRefundsId())
-                );
-            } else {
-                kylinOrderRefundsMapper.update(
-                        kylinOrderRefunds,
-                        new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refund.getOrderRefundsId())
-                );
-            }
+                );*/
+            kylinOrderRefundsMapper.update(
+                    kylinOrderRefunds,
+                    new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refund.getOrderRefundsId())
+            );
         }
 
         return true;