Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundApplyParam.java

@@ -33,4 +33,6 @@ public class RefundApplyParam implements Serializable {
 
     private String refuse;
 
+    private String type;
+
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinStationCheckRefreshVo.java

+package com.liquidnet.service.kylin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "KylinStationCheckRefreshVo", description = "下载刷新验票信息响应参数")
+@Data
+public class KylinStationCheckRefreshVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -7313121561515036798L;
+    private KylinStationPerformanceVo performanceVo;
+    private List<KylinStationCheckOrderVo> checkOrderVos;
+
+    private static final KylinStationCheckRefreshVo obj = new KylinStationCheckRefreshVo();
+
+    public static KylinStationCheckRefreshVo getNew() {
+        try {
+            return (KylinStationCheckRefreshVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinStationCheckRefreshVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinStationPerformanceVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 @ApiModel(value = "KylinStationPerformanceVo", description = "演出列表响应参数")
@@ -29,6 +30,14 @@ public class KylinStationPerformanceVo implements Serializable, Cloneable {
     private List<KylinStationTicketVo> ticketVoList;
     @ApiModelProperty(position = 18, value = "可下载时间")
     private String canDownTime;
+    @ApiModelProperty(position = 20, value = "票房")
+    private BigDecimal priceSum;
+    @ApiModelProperty(position = 21, value = "票量[9]")
+    private Integer number;
+    @ApiModelProperty(position = 22, value = "已验票量[9]")
+    private Integer checkedNum;
+    @ApiModelProperty(position = 23, value = "余量[9]")
+    private Integer remainderNum;
 
     private static final KylinStationPerformanceVo obj = new KylinStationPerformanceVo();
 

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

@@ -6,6 +6,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderRefundsServiceImpl;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderTicketsAdminServiceImpl;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
@@ -19,8 +20,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
-import javax.websocket.server.PathParam;
-
 /**
  * <p>
  * 后台单订单退款 服务实现类
@@ -88,11 +87,11 @@ public class KylinOrderRefundAdminController extends BaseController {
     @ResponseBody
     public AjaxResult refundApply(RefundApplyParam refundApplyParam) {
         try {
-            Boolean res = kylinOrderRefundsServiceImpl.refundApply(refundApplyParam);
-            if (res) {
+            ResponseDto res = kylinOrderRefundsServiceImpl.refundApply(refundApplyParam);
+            if (res.isSuccess()) {
                 return success();
             } else {
-                return error("申请退款失败");
+                return error(res.getMessage());
             }
         } catch (Exception e) {
             return error(e.getMessage());
@@ -104,11 +103,12 @@ public class KylinOrderRefundAdminController extends BaseController {
     @ResponseBody
     public AjaxResult refundCancel(RefundApplyParam refundApplyParam) {
         try {
-            Boolean res = kylinOrderRefundsServiceImpl.refundCancel(refundApplyParam);
-            if (res) {
+            refundApplyParam.setType("cancel");
+            ResponseDto res = kylinOrderRefundsServiceImpl.refundCheckStatus(refundApplyParam);
+            if (res.isSuccess()) {
                 return success();
             } else {
-                return error("取消退款失败");
+                return error(res.getMessage());
             }
         } catch (Exception e) {
             return error(e.getMessage());
@@ -120,12 +120,12 @@ public class KylinOrderRefundAdminController extends BaseController {
     @ResponseBody
     public AjaxResult refundReapply(RefundApplyParam refundApplyParam) {
         try {
-            Boolean res = kylinOrderRefundsServiceImpl.refundReapply(refundApplyParam);
-            if (res) {
+            refundApplyParam.setType("reapply");
+            ResponseDto res = kylinOrderRefundsServiceImpl.refundCheckStatus(refundApplyParam);
+            if (res.isSuccess()) {
                 return success();
             } else {
-                // 不是重新发起退款，而是重新发起退款审核
-                return error("再次发起退款审核失败");
+                return error(res.getMessage());
             }
         } catch (Exception e) {
             return error(e.getMessage());
@@ -138,18 +138,20 @@ public class KylinOrderRefundAdminController extends BaseController {
     @ResponseBody
     public AjaxResult refundReview(RefundApplyParam refundApplyParam) {
         try {
-            Boolean res = false;
+            ResponseDto res = null;
             Integer status = refundApplyParam.getStatus();
             if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED) { // 通过
-                res = kylinOrderRefundsServiceImpl.refundApproved(refundApplyParam);
+                refundApplyParam.setType("approved");
+                res = kylinOrderRefundsServiceImpl.refundCheckStatus(refundApplyParam);
             }
             if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { // 驳回
-                res = kylinOrderRefundsServiceImpl.refundReject(refundApplyParam);
+                refundApplyParam.setType("reject");
+                res = kylinOrderRefundsServiceImpl.refundCheckStatus(refundApplyParam);
             }
-            if (res) {
+            if (res.isSuccess()) {
                 return success();
             } else {
-                return error("审核退款失败");
+                return error(res.getMessage());
             }
         } catch (Exception e) {
             return error(e.getMessage());
@@ -162,18 +164,20 @@ public class KylinOrderRefundAdminController extends BaseController {
     @ResponseBody
     public AjaxResult refundExecute(RefundApplyParam refundApplyParam) {
         try {
-            Boolean res = false;
+            ResponseDto res = null;
             Integer status = refundApplyParam.getStatus();
             if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_UNFILLED) { // 通过
-                res = kylinOrderRefundsServiceImpl.refundUnfilled(refundApplyParam);
+                refundApplyParam.setType("unfilled");
+                res = kylinOrderRefundsServiceImpl.refundCheckStatus(refundApplyParam);
             }
             if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE) { // 驳回
-                res = kylinOrderRefundsServiceImpl.refundRefuse(refundApplyParam);
+                refundApplyParam.setType("refuse");
+                res = kylinOrderRefundsServiceImpl.refundCheckStatus(refundApplyParam);
             }
-            if (res) {
+            if (res.isSuccess()) {
                 return success();
             } else {
-                return error("审核退款失败");
+                return error(res.getMessage());
             }
         } catch (Exception e) {
             return error(e.getMessage());

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

@@ -6,11 +6,9 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinRefundPerformancesAdminServiceImpl;
 import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
-import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam;
 import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesVo;
-import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml

@@ -24,6 +24,10 @@ liquidnet:
       username: testmall
       password: zhengzai!mYT
       database-name: dev_ln_scene
+  url-refund:
+    apply: "http://devpay.zhengzai.tv/refund/single"
+    notify: "https://devzuul.zhengzai.tv/kylin/refund/callback"
+
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml

@@ -24,6 +24,9 @@ liquidnet:
       username: testmall
       password: zhengzai!mYT
       database-name: test_ln_scene
+  url-refund:
+    apply: "http://pay.zhengzai.tv/refund/single"
+    notify: "https://zuul.zhengzai.tv/kylin/refund/callback"
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml

@@ -24,6 +24,9 @@ liquidnet:
       username: zhengzai
       password: $hAh4SGcDQ
       database-name: test_ln_scene
+  url-refund:
+    apply: "http://testpay.zhengzai.tv/refund/single"
+    notify: "https://zuul.zhengzai.tv/kylin/refund/callback"
 # end-dev-这里是配置信息基本值
 
 spring:

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

@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
@@ -15,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -67,7 +67,7 @@ public class KylinRefundExecuteServiceImpl {
                 if (order.getPriceExpress() != null) {
                     refundApplyParam.setRefundPriceExpress(order.getPriceExpress().doubleValue());
                 }
-                Boolean res = kylinOrderRefundsServiceImpl.refundApply(refundApplyParam);
+                ResponseDto res = kylinOrderRefundsServiceImpl.refundApply(refundApplyParam);
             }
 
             count = orderList.size();
@@ -91,17 +91,21 @@ public class KylinRefundExecuteServiceImpl {
                 break;
             case "review":
                 if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED) { // 通过申请
+                    type = "approved";
                     whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
                 }
                 if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { // 驳回申请
+                    type = "reject";
                     whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
                 }
                 break;
             case "execute":
                 if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_UNFILLED) { // 执行退款
+                    type = "unfilled";
                     whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};
                 }
                 if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE) { // 拒绝退款
+                    type = "refuse";
                     whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};
                 }
                 break;
@@ -121,34 +125,14 @@ public class KylinRefundExecuteServiceImpl {
 
                 RefundApplyParam refundApplyParam = new RefundApplyParam();
                 refundApplyParam.setIds(refundIds);
-                Boolean res = null;
-
-                switch (type) {
-                    case "reapply":
-                        res = kylinOrderRefundsServiceImpl.refundReapply(refundApplyParam);
-                        break;
-                    case "cancel":
-                        res = kylinOrderRefundsServiceImpl.refundCancel(refundApplyParam);
-                        break;
-                    case "review":
-                        if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED) { // 通过申请
-                            res = kylinOrderRefundsServiceImpl.refundApproved(refundApplyParam);
-                        }
-                        if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { // 驳回申请
-                            res = kylinOrderRefundsServiceImpl.refundReject(refundApplyParam);
-                        }
-                        break;
-                    case "execute":
-                        if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_UNFILLED) { // 执行退款
-                            res = kylinOrderRefundsServiceImpl.refundUnfilled(refundApplyParam);
-                        }
-                        if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE) { // 拒绝退款
-                            res = kylinOrderRefundsServiceImpl.refundRefuse(refundApplyParam);
-                        }
-                        break;
-                    default:
-                        throw new Exception("type异常，无法操作");
+                refundApplyParam.setType(type);
+                if (null != refundBatchApplyParam.getRefuse()) {
+                    refundApplyParam.setRefuse(refundBatchApplyParam.getRefuse());
                 }
+                if (null != refundBatchApplyParam.getReject()) {
+                    refundApplyParam.setReject(refundBatchApplyParam.getReject());
+                }
+                ResponseDto res = kylinOrderRefundsServiceImpl.refundCheckStatus(refundApplyParam);
             }
 
             count = refundList.size();

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

@@ -4,17 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
 import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam;
 import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesVo;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
 import com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;

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

@@ -26,11 +26,10 @@ import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
-import com.sun.media.jfxmedia.logging.Logger;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpException;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -45,7 +44,7 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- * 退款表 服务实现类
+ * 订单退款表 服务实现类 处理数据 退款后状态的变化
  * </p>
  *
  * @author jiaangxiulong
@@ -55,6 +54,11 @@ import java.util.stream.Collectors;
 @Service
 public class KylinRefundsStatusServiceImpl {
 
+    @Value("${liquidnet.url-refund.apply}")
+    private String applyUrl;
+    @Value("${liquidnet.url-refund.notify}")
+    private String notifyUrl;
+
     @Autowired
     private KylinOrderTicketsMapper kylinOrderTicketsMapper;
 
@@ -77,7 +81,7 @@ public class KylinRefundsStatusServiceImpl {
             RefundApplyParam refundApplyParam, KylinOrderTickets orderInfo, String orderTicketsId,
             double RefundPriceExpress, double priceExpress,
             int ticketEntityCount, List<String> ticketEntityIds
-    ) throws HttpException {
+    ) {
         // 处理数据
         String authId = ShiroUtils.getUserId().toString();
         String authName = ShiroUtils.getLoginName();
@@ -225,90 +229,53 @@ public class KylinRefundsStatusServiceImpl {
         return true;
     }
 
-    public boolean orderTicketRefundReapply(List<KylinOrderRefunds> refundList) {
-        String authId = ShiroUtils.getUserId().toString();
-        String authName = ShiroUtils.getLoginName();
-
-        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
-        kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);
-        kylinOrderRefunds.setApplicantId(authId);
-        kylinOrderRefunds.setApplicantName(authName);
-        kylinOrderRefunds.setApplicantAt(LocalDateTime.now());
-
-        List<String> refundIds = refundList.stream().map(KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList());
-
-        kylinOrderRefundsMapper.update(
-                kylinOrderRefunds,
-                new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundIds)
-        );
-
-        return true;
-    }
-
-    public boolean orderTicketRefundApproved(List<KylinOrderRefunds> refundList, String reject) {
-        String authId = ShiroUtils.getUserId().toString();
-        String authName = ShiroUtils.getLoginName();
-
-        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
-        kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED);
-        kylinOrderRefunds.setAuditorId(authId);
-        kylinOrderRefunds.setAuditorName(authName);
-        kylinOrderRefunds.setAuditorAt(LocalDateTime.now());
-        kylinOrderRefunds.setReject(reject);
-
-        List<String> refundIds = refundList.stream().map(KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList());
-
-        kylinOrderRefundsMapper.update(
-                kylinOrderRefunds,
-                new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundIds)
-        );
-
-        return true;
-    }
-
-    public boolean orderTicketRefundReject(List<KylinOrderRefunds> refundList, String reject) {
+    public boolean orderRefundChangeStatus(List<KylinOrderRefunds> refundList, String type, String reject, String refuse) {
         String authId = ShiroUtils.getUserId().toString();
         String authName = ShiroUtils.getLoginName();
-
         KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
-        kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT);
-        kylinOrderRefunds.setAuditorId(authId);
-        kylinOrderRefunds.setAuditorName(authName);
-        kylinOrderRefunds.setAuditorAt(LocalDateTime.now());
-        kylinOrderRefunds.setReject(reject);
 
-        List<String> refundIds = refundList.stream().map(KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList());
+        switch (type) {
+            case "reapply":
+                kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);
+                kylinOrderRefunds.setApplicantId(authId);
+                kylinOrderRefunds.setApplicantName(authName);
+                kylinOrderRefunds.setApplicantAt(LocalDateTime.now());
+                break;
+            case "approved":
+                kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED);
+                kylinOrderRefunds.setAuditorId(authId);
+                kylinOrderRefunds.setAuditorName(authName);
+                kylinOrderRefunds.setAuditorAt(LocalDateTime.now());
+                kylinOrderRefunds.setReject(reject);
+                break;
+            case "Reject":
+                kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT);
+                kylinOrderRefunds.setAuditorId(authId);
+                kylinOrderRefunds.setAuditorName(authName);
+                kylinOrderRefunds.setAuditorAt(LocalDateTime.now());
+                kylinOrderRefunds.setReject(reject);
+                break;
+            case "refuse":
+                kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE);
+                kylinOrderRefunds.setExecutorId(authId);
+                kylinOrderRefunds.setExecutorName(authName);
+                kylinOrderRefunds.setExecutorAt(LocalDateTime.now());
+                kylinOrderRefunds.setRefuse(refuse);
+                break;
+        }
 
-        kylinOrderRefundsMapper.update(
-                kylinOrderRefunds,
-                new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundIds)
+        List<String> orderRefundIds = refundList.stream().map(
+                KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList()
         );
-
-        return true;
-    }
-
-    public boolean orderTicketRefundRefuse(List<KylinOrderRefunds> refundList, String refuse) {
-        String authId = ShiroUtils.getUserId().toString();
-        String authName = ShiroUtils.getLoginName();
-
-        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
-        kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE);
-        kylinOrderRefunds.setExecutorId(authId);
-        kylinOrderRefunds.setExecutorName(authName);
-        kylinOrderRefunds.setExecutorAt(LocalDateTime.now());
-        kylinOrderRefunds.setRefuse(refuse);
-
-        List<String> refundIds = refundList.stream().map(KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList());
-
         kylinOrderRefundsMapper.update(
                 kylinOrderRefunds,
-                new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundIds)
+                new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", orderRefundIds)
         );
 
         return true;
     }
 
-    public boolean orderTicketRefundUnfilled(List<KylinOrderRefunds> refundList, String refuse) throws Exception {
+    public boolean orderTicketRefundUnfilled(List<KylinOrderRefunds> refundList, String refuse) {
         String authId = ShiroUtils.getUserId().toString();
         String authName = ShiroUtils.getLoginName();
 
@@ -320,9 +287,6 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setRefuse(refuse);
 //        List<String> refundIds = refundList.stream().map(KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList());
 
-        // 开始执行退款
-        String postUrl = "http://testpay.zhengzai.tv/refund/single";
-
         for (KylinOrderRefunds refund : refundList) {
             KylinOrderTickets oderInfo = kylinOrderTicketsMapper.selectOne(
                     new QueryWrapper<KylinOrderTickets>()
@@ -333,7 +297,7 @@ public class KylinRefundsStatusServiceImpl {
             params.add("order_refund_code", refund.getOrderRefundCode());
             params.add("price", refund.getPrice().toString());
             params.add("reason", refund.getReason());
-            params.add("notify_url", "http://zuul.zhengzai.tv/kylin/refund/callback");
+            params.add("notify_url", notifyUrl);
 
             String sign = StringUtils.Ksort(params);
             sign = sign.concat("&key=").concat("R7tXY9smPQPG9Ku5yI0u6sfnlckmk04V");
@@ -345,7 +309,7 @@ public class KylinRefundsStatusServiceImpl {
             // start 
             // TODO: 2021/5/31 待整理
             String postResult = null;
-            postResult = HttpUtil.post(postUrl, params);
+            postResult = HttpUtil.post(applyUrl, params);
             JsonNode postResultNew = JsonUtils.fromJson(postResult, JsonNode.class);
             // 请求提审接口结果
             if (postResultNew.get("message").toString() != "OK") {

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml

@@ -21,9 +21,6 @@ liquidnet:
     pay: "http://testpay.zhengzai.tv/"
     check: "http://testpay.zhengzai.tv/order/verify"
     localUrl: "https://zuul.zhengzai.tv/kylin/order/syncOrder"
-  url-refund:
-    apply: "http://testpay.zhengzai.tv/refund/single"
-    notify: "https://devzuul.zhengzai.tv/kylin/refund/callback"
 
 #以下为spring各环境个性配置
 spring:

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -21,9 +21,6 @@ liquidnet:
     pay: "http://testpay.zhengzai.tv/"
     check: "http://testpay.zhengzai.tv/order/verify"
     localUrl: "https://zuul.zhengzai.tv/kylin/order/syncOrder"
-  url-refund:
-    apply: "http://testpay.zhengzai.tv/refund/single"
-    notify: "https://zuul.zhengzai.tv/kylin/refund/callback"
 
 #以下为spring各环境个性配置
 spring: