Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

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

@@ -312,6 +312,13 @@ public class KylinRefundsStatusServiceImpl {
                         new Document("$set", new Document("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL)
                                 .append("updatedAt", LocalDateTime.now()))
                 );
+            } else { // 这里主要是防止批量审核同一个用户多个票 每次查询都还有正在退款的订单 导致拒绝了还是退款中状态 后期可想办法优化
+                KylinOrderRefunds kylinOrderRefunds = KylinOrderRefunds.getNew();
+                kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT);
+                kylinOrderRefundsMapper.update(
+                        kylinOrderRefunds,
+                        new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", orderRefundsId)
+                );
             }
 
         }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_20211115_express_refund.sql

@@ -19,7 +19,7 @@ CREATE TABLE `kylin_express_module`
   COLLATE utf8mb4_unicode_ci
   ROW_FORMAT = DYNAMIC COMMENT '快递模板表';
 
-alter table kylin_performance_status add is_back_paper_ticket tinyint NOT NULL DEFAULT 0 COMMENT '快递票是否需要退回 0不需要 1需要' after is_refund_express;
-alter table kylin_performance_status add is_refund_express_new tinyint NOT NULL DEFAULT 0 COMMENT '用户退款快递票是否退快递费 1退回 0不退回' after is_back_paper_ticket;
+alter table kylin_performance_status add is_back_paper_ticket tinyint NOT NULL DEFAULT 1 COMMENT '快递票是否需要退回 0不需要 1需要' after is_refund_express;
+alter table kylin_performance_status add is_refund_express_new tinyint NOT NULL DEFAULT 1 COMMENT '用户退款快递票是否退快递费 1退回 0不退回' after is_back_paper_ticket;
 
 alter table kylin_order_refunds add ticket_num varchar(255) NOT NULL DEFAULT '' COMMENT '纸质票号' after price_express;
\ No newline at end of file