Merge remote-tracking branch 'origin/dev' 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-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/KylinOrderRefundsServiceImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
+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;
@@ -23,7 +23,6 @@ import com.liquidnet.service.kylin.mapper.KylinOrderTicketStatusMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
 import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -33,7 +32,7 @@ import java.util.List;
 
 /**
  * <p>
- * 订单退款表 服务实现类
+ * 订单退款表 服务实现类 处理逻辑判断
  * </p>
  *
  * @author jiangxiulong
@@ -60,14 +59,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
     @Autowired
     MongoTemplate mongoTemplate;
 
-    public Boolean refundApply(RefundApplyParam refundApplyParam) throws Exception {
-        /*int count = 0;
-        count = kylinOrderTicketsMapper.selectCount(
-                new UpdateWrapper<KylinOrderTickets>().eq("order_tickets_id", refundApplyParam.getOrderTicketsId()).eq("coupon_type", "no")
-        );
-        if (count > 0) {
-            throw new Exception("使用满减券 暂不能退款");
-        }*/
+    public ResponseDto refundApply(RefundApplyParam refundApplyParam) {
         String orderTicketsId = refundApplyParam.getOrderTicketsId();
         List<String> ticketEntityIds = refundApplyParam.getTicketEntityIds();
         double RefundPriceExpress = refundApplyParam.getRefundPriceExpress();
@@ -86,15 +78,15 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
 
         // 订单状态需已付款
         if (thisOrderStatus != KylinTableStatusConst.ORDER_STATUS1) {
-            throw new HttpException("订单状态信息有误");
+            return ResponseDto.failure("订单状态信息有误");
         }
         // 订单支付状态需为已支付
         if (thisPayStatus != KylinTableStatusConst.ORDER_PAY_STATUS1) {
-            throw new HttpException("订单支付信息有误");
+            return ResponseDto.failure("订单支付信息有误");
         }
         // 传的快递费不能大于实际的快递费
         if (RefundPriceExpress > priceExpress) {
-            throw new HttpException("快递费不能大于实际的快递费");
+            return ResponseDto.failure("快递费不能大于实际的快递费");
         }
         // 该订单正在退款或已有退款
         QueryWrapper<KylinOrderRefunds> refundingCountQuery = new QueryWrapper<KylinOrderRefunds>()
@@ -105,19 +97,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         }
         int refundingCount = kylinOrderRefundsMapper.selectCount(refundingCountQuery);
         if (refundingCount > 0) {
-            throw new HttpException("该订单正在退款或已有退款");
+            return ResponseDto.failure("该订单正在退款或已有退款");
         }
 
-        // 该订单的入场人未付款/正在退款/已退款
-        // TODO: 2021/5/27 出票未出票不知是否要处理
-        /*QueryWrapper<KylinOrderTicketEntities> notPayCountQuery = new QueryWrapper<KylinOrderTicketEntities>()
-                .in("order_ticket_entities_id", ticketEntityIds)
-                .in("is_payment", new Integer[]{
-                        KylinTableStatusConst.ENTITIES_IS_PAYMENT0,
-                        KylinTableStatusConst.ENTITIES_IS_PAYMENT2,
-                        KylinTableStatusConst.ENTITIES_IS_PAYMENT3});
-        int notPayCount = kylinOrderTicketEntitiesMapper.selectCount(notPayCountQuery);*/
-
         // 选择退款的入场人是否正确
         // TODO: 2021/5/27 出票未出票不知是否要处理
         QueryWrapper<KylinOrderTicketEntities> choiceCountQuery = new QueryWrapper<KylinOrderTicketEntities>()
@@ -127,7 +109,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         int choiceCount = kylinOrderTicketEntitiesMapper.selectCount(choiceCountQuery);
         int ticketEntityCount = ticketEntityIds.size();
         if (choiceCount < 0 || choiceCount != ticketEntityCount) {
-            throw new HttpException("入场人订单有误或不存在");
+            return ResponseDto.failure("入场人订单有误或不存在");
         }
 
         boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunding(
@@ -136,142 +118,80 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 ticketEntityCount, ticketEntityIds
         );
         if (res) {
-            return true;
+            return ResponseDto.success();
         } else {
-            return false;
+            return ResponseDto.failure("操作失败");
         }
     }
 
-    public Boolean refundCancel(RefundApplyParam refundApplyParam) throws Exception {
-        List<String> orderRefundsIdList = refundApplyParam.getIds();
-        Integer[] orderRefundStatus = {KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
-        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
-                new QueryWrapper<KylinOrderRefunds>()
-                        .eq("type", KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY)
-                        .in("order_refunds_id", orderRefundsIdList)
-                        .in("status", orderRefundStatus)
-        );
-        if (orderRefundsIdList.size() != refundList.size()) {
-            throw new Exception("订单需未审核、已驳回、已回绝，非自动退款订单");
-        }
-
-        boolean res = kylinRefundsStatusServiceImpl.orderTicketRefundCancel(refundList);
-        if (res) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public Boolean refundReapply(RefundApplyParam refundApplyParam) throws Exception {
-        List<String> orderRefundsIdList = refundApplyParam.getIds();
-        Integer[] orderRefundStatus = {KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
-        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
-                new QueryWrapper<KylinOrderRefunds>()
-                        .eq("type", KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY)
-                        .in("order_refunds_id", orderRefundsIdList)
-                        .in("status", orderRefundStatus)
-        );
-        if (orderRefundsIdList.size() != refundList.size()) {
-            throw new Exception("订单需一审驳回或二审驳回");
-        }
-
-        boolean res = kylinRefundsStatusServiceImpl.orderTicketRefundReapply(refundList);
-        if (res) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public Boolean refundApproved(RefundApplyParam refundApplyParam) throws Exception {
+    public ResponseDto refundCheckStatus(RefundApplyParam refundApplyParam) {
+        String type = refundApplyParam.getType();
         List<String> orderRefundsIdList = refundApplyParam.getIds();
         if (orderRefundsIdList.size() <= 0) {
-            throw new Exception("无退款订单");
-        }
-        String reject = refundApplyParam.getReject();
-        Integer[] orderRefundStatus = {KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
-        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
-                new QueryWrapper<KylinOrderRefunds>()
-                        .eq("type", KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY)
-                        .in("order_refunds_id", orderRefundsIdList)
-                        .in("status", orderRefundStatus)
-        );
-        if (orderRefundsIdList.size() != refundList.size()) {
-            throw new Exception("订单需未审核、已驳回、已回绝，请检查订单状态");
+            return ResponseDto.failure("无退款订单");
+        }
+        Integer[] orderRefundStatus = null;
+        Integer orderType = KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY;
+        switch (type) {
+            default:
+                return ResponseDto.failure("type类型错误");
+            case "cancel":
+                orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
+                break;
+            case "reapply":
+                orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
+                break;
+            case "approved":
+                orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
+                break;
+            case "reject":
+                orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
+                break;
+            case "unfilled":
+                orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};
+                break;
+            case "refuse":
+                orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};
+                break;
         }
 
-        boolean res = kylinRefundsStatusServiceImpl.orderTicketRefundApproved(refundList, reject);
-        if (res) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public Boolean refundReject(RefundApplyParam refundApplyParam) throws Exception {
-        List<String> orderRefundsIdList = refundApplyParam.getIds();
-        String reject = refundApplyParam.getReject();
-        Integer[] orderRefundStatus = {KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
         List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
                 new QueryWrapper<KylinOrderRefunds>()
-                        .eq("type", KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY)
+                        .eq("type", orderType)
                         .in("order_refunds_id", orderRefundsIdList)
                         .in("status", orderRefundStatus)
         );
         if (orderRefundsIdList.size() != refundList.size()) {
-            throw new Exception("订单需未审核、已审核、已回绝，请检查订单状态");
+            return ResponseDto.failure("当前状态不允许操作");
         }
 
-        boolean res = kylinRefundsStatusServiceImpl.orderTicketRefundReject(refundList, reject);
-        if (res) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public Boolean refundUnfilled(RefundApplyParam refundApplyParam) throws Exception {
-        List<String> orderRefundsIdList = refundApplyParam.getIds();
-        String refuse = refundApplyParam.getRefuse();
-        Integer[] orderRefundStatus = {KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};
-        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
-                new QueryWrapper<KylinOrderRefunds>()
-                        .eq("type", KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY)
-                        .in("order_refunds_id", orderRefundsIdList)
-                        .in("status", orderRefundStatus)
-        );
-        if (orderRefundsIdList.size() != refundList.size()) {
-            throw new Exception("订单需已审核、退款失败，请检查订单状态");
-        }
-
-        boolean res = kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);
-        if (res) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public Boolean refundRefuse(RefundApplyParam refundApplyParam) throws Exception {
-        List<String> orderRefundsIdList = refundApplyParam.getIds();
+        boolean res = false;
+        String reject = refundApplyParam.getReject();
         String refuse = refundApplyParam.getRefuse();
-        Integer[] orderRefundStatus = {KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};
-        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
-                new QueryWrapper<KylinOrderRefunds>()
-                        .eq("type", KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY)
-                        .in("order_refunds_id", orderRefundsIdList)
-                        .in("status", orderRefundStatus)
-        );
-        if (orderRefundsIdList.size() != refundList.size()) {
-            throw new Exception("订单需已审核、退款失败，请检查订单状态");
+        switch (type) {
+            case "cancel":
+                res = kylinRefundsStatusServiceImpl.orderTicketRefundCancel(refundList);
+                break;
+            case "reapply":
+                res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, "", "");
+                break;
+            case "approved":
+                res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
+                break;
+            case "Reject":
+                res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
+                break;
+            case "unfilled":
+                res = kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);
+                break;
+            case "refuse":
+                res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, "", refuse);
+                break;
         }
-
-        boolean res = kylinRefundsStatusServiceImpl.orderTicketRefundRefuse(refundList, refuse);
         if (res) {
-            return true;
+            return ResponseDto.success();
         } else {
-            return false;
+            return ResponseDto.failure("操作失败");
         }
     }
 

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);
+                refundApplyParam.setType(type);
+                if (null != refundBatchApplyParam.getRefuse()) {
+                    refundApplyParam.setRefuse(refundBatchApplyParam.getRefuse());
                 }
-                        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异常，无法操作");
+                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) {
+    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();
+
+        switch (type) {
+            case "reapply":
                 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();
+                break;
+            case "approved":
                 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) {
-        String authId = ShiroUtils.getUserId().toString();
-        String authName = ShiroUtils.getLoginName();
-
-        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
+                break;
+            case "Reject":
                 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());
-
-        kylinOrderRefundsMapper.update(
-                kylinOrderRefunds,
-                new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundIds)
-        );
-
-        return true;
-    }
-
-    public boolean orderTicketRefundRefuse(List<KylinOrderRefunds> refundList, String refuse) {
-        String authId = ShiroUtils.getUserId().toString();
-        String authName = ShiroUtils.getLoginName();
-
-        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
+                break;
+            case "refuse":
                 kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE);
                 kylinOrderRefunds.setExecutorId(authId);
                 kylinOrderRefunds.setExecutorName(authName);
                 kylinOrderRefunds.setExecutorAt(LocalDateTime.now());
                 kylinOrderRefunds.setRefuse(refuse);
+                break;
+        }
 
-        List<String> refundIds = refundList.stream().map(KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList());
-
+        List<String> orderRefundIds = 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: