删除refund_cate；@Log修改title；ticketAudit；3正在退款状态没用删除；退款remark改成非必填；退款入库队列order只留超...

删除refund_cate；@Log修改title；ticketAudit；3正在退款状态没用删除；退款remark改成非必填；退款入库队列order只留超时，kylin留发起和取消，sweet删除退款相关；

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinTableStatusConst.java

@@ -30,19 +30,16 @@ public class KylinTableStatusConst {
     public static final Integer ORDER_REFUND_STATUS_APPLY = 0; // 请求退款
     public static final Integer ORDER_REFUND_STATUS_APPROVED = 1; // 一审同意 审核通过
     public static final Integer ORDER_REFUND_STATUS_CANCEL = 2; // 取消退款
-    public static final Integer ORDER_REFUND_STATUS_REFUNDING = 3; // 正在退款
     public static final Integer ORDER_REFUND_STATUS_REFUNDED = 4; // 完成退款
     public static final Integer ORDER_REFUND_STATUS_REJECT = 5; // 一审驳回退款 等同取消
     public static final Integer ORDER_REFUND_STATUS_ERROR = 6; // 退款失败
     public static final Integer ORDER_REFUND_STATUS_UNFILLED = 7; // 二审同意 等待退款
     public static final Integer ORDER_REFUND_STATUS_REFUSE = 8; // 二审拒绝
+    public static final Integer ORDER_REFUND_STATUS_TICKET = 9; // 票务确认收货
 
-    public static final Integer ORDER_REFUND_TYPE_APPLY = 0; // 人工申请类型的退款，可以取消退款，退款完成需返还库存
-    public static final Integer ORDER_REFUND_TYPE_AUTO = 1; // 自动申请类型的退款，无法取消退款，退款完成不返还库存
+    public static final Integer ORDER_REFUND_TYPE_APPLY = 0; // 人工申请（后台客服和用户），可以取消退款，回调再处理库存和券
+    public static final Integer ORDER_REFUND_TYPE_AUTO = 1; // 超时退款，无法取消退款，直接返还库存和券，回调不再处理库存和券
 
-    public static final Integer ORDER_REFUND_CATE1 = 1; // 1票务2快递费3票和快递费
-    public static final Integer ORDER_REFUND_CATE2 = 2;
-    public static final Integer ORDER_REFUND_CATE3 = 3;
     /**
      * 订单状态表状态
      */

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

@@ -35,6 +35,7 @@ public class RefundApplyParam implements Serializable {
     private String reject;
 
     private String refuse;
+    private String ticketRemark;
 
     private String type;
 

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

@@ -111,7 +111,6 @@ public class KylinOrderRefundsVo implements Serializable,Cloneable {
 
     @ApiModelProperty(value = "票务/快递费/票和快递费")
     private String refundType;
-    private Integer refundCate;
 
     @ApiModelProperty(value = "添加时间")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BusinessType.java

@@ -87,6 +87,11 @@ public enum BusinessType
      */
    AUDIT2,
 
+    /**
+     *  票务审核退款
+     */
+    AUDIT3,
+
     /**
      *  申请 16
      */

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

@@ -147,7 +147,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         }
     }
 
-    // 一审
+    // 运营审核
     @Log(title = "订单退款列表", businessType = BusinessType.AUDIT)
     @RequiresPermissions("kylin:refund:review")
     @PostMapping("review")
@@ -176,7 +176,30 @@ public class KylinOrderRefundAdminController extends BaseController {
         }
     }
 
-    // 二审
+    // 票务审核
+    @Log(title = "票务审核退款", businessType = BusinessType.AUDIT3)
+    @RequiresPermissions("kylin:refund:ticketAudit")
+    @PostMapping("ticketAudit")
+    @ResponseBody
+    public AjaxResult ticketAudit(RefundApplyParam refundApplyParam) {
+        try {
+            ResponseDto res = null;
+            refundApplyParam.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_TICKET);
+            String authId = ShiroUtils.getUserId().toString();
+            String authName = ShiroUtils.getLoginName();
+            refundApplyParam.setType("ticketAudit");
+            res = kylinOrderRefundsServiceImpl.refundCheckStatus(refundApplyParam, authId, authName);
+            if (res.isSuccess()) {
+                return success();
+            } else {
+                return error(res.getMessage());
+            }
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
+    // 财务审核
     @Log(title = "订单退款列表", businessType = BusinessType.AUDIT2)
     @RequiresPermissions("kylin:refund:execute")
     @PostMapping("execute")
@@ -245,11 +268,11 @@ public class KylinOrderRefundAdminController extends BaseController {
             @ApiImplicitParam(type = "form", required = true, dataType = "int", name = "type", value = "1退款单号 2订单号", example = ""),
     })
     public AjaxResult loginSmsSwitch(@NotNull(message = "订单号不能为空") @RequestParam String code,
-                                              @NotNull(message = "类型不能为空") @RequestParam int type) {
-        String codeNum = kylinOrderRefundsService.getOrderRefundCode(code,type);
-        if(codeNum==null){
+                                     @NotNull(message = "类型不能为空") @RequestParam int type) {
+        String codeNum = kylinOrderRefundsService.getOrderRefundCode(code, type);
+        if (codeNum == null) {
             return success("ERROR");
-        }else{
+        } else {
             return success(codeNum);
         }
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html

@@ -30,7 +30,6 @@
                                     <option value="5">一审驳回退款</option>
                                     <option value="7">二审通过等待退款</option>
                                     <option value="8">二审驳回退款</option>
-                                    <option value="3">正在退款</option>
                                     <option value="4">完成退款</option>
                                     <option value="6">退款失败</option>
                                 </shiro:hasRole>
@@ -43,7 +42,6 @@
                                         <option value="5">一审驳回退款</option>
                                         <option value="7">二审通过等待退款</option>
                                         <option value="8">二审驳回退款</option>
-                                        <option value="3">正在退款</option>
                                         <option value="4">完成退款</option>
                                         <option value="6">退款失败</option>
                                     </shiro:lacksRole>
@@ -126,10 +124,9 @@
                 <div class="row">
                     <div class="col-sm-12">
                         <div class="form-group">
-                            <label class="col-xs-2 control-label layui-required">备注：</label>
+                            <label class="col-xs-2 control-label">备注：</label>
                             <div class="col-xs-10">
-                                <textarea name="remark" maxlength="500" class="form-control layui-required"
-                                          rows="3"></textarea>
+                                <textarea name="remark" maxlength="500" class="form-control" rows="3"></textarea>
                             </div>
                         </div>
                     </div>
@@ -172,16 +169,12 @@
             type: 1,
             fixed: false,
             maxmin: true,
-            title: '一审',
+            title: '运营审核',
             area: ['500px', '220px'],
             content: $("#form-refund-review").html(),
             btn: ["通过", '拒绝'],
             yes: function (index, layero) {
                 var remark = $(layero).find("[name='remark']").val();
-                if (!remark) {
-                    layer.msg("请填写备注");
-                    return false;
-                }
                 data['reject'] = remark;
                 data['status'] = 1;
                 $.operate.save(prefix + "/review", data);
@@ -189,20 +182,42 @@
             },
             btn2: function (index, layero) {
                 var remark = $(layero).find("[name='remark']").val();
-                if (!remark) {
-                    layer.msg("请填写备注");
-                    return false;
-                }
                 data['reject'] = remark;
                 data['status'] = 5;
                 $.operate.save(prefix + "/review", data);
-                // return false;
             }
         });
     }
 
+    function ticketAudit(id) {
+        var data = '';
+        if (id) {
+            var ids = [id];
+            data = {"ids": ids.join()};
+        } else {
+            var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
+            data = {"ids": rows.join()};
+        }
+        layer.open({
+            type: 1,
+            fixed: false,
+            maxmin: true,
+            title: '票务审核',
+            area: ['500px', '220px'],
+            content: $("#form-refund-review").html(),
+            btn: ["确认收货", '没收到，再等等吧～'],
+            yes: function (index, layero) {
+                var remark = $(layero).find("[name='remark']").val();
+                data['ticketRemark'] = remark;
+                data['status'] = 1;
+                $.operate.save(prefix + "/ticketAudit", data);
+                layer.close(index)
+            },
+            btn2: function (index, layero) {}
+        });
+    }
+
     function execute(id) {
-        // $.modal.open("二审", prefix + '/reviewExecute', '800', '300', 2222);
         var data = '';
         if (id) {
             var ids = [id];
@@ -215,16 +230,12 @@
             type: 1,
             fixed: false,
             maxmin: true,
-            title: '二审',
+            title: '财务审核',
             area: ['500px', '220px'],
             content: $("#form-refund-review").html(),
             btn: ["通过", '拒绝'],
             yes: function (index, layero) {
                 var remark = $(layero).find("[name='remark']").val();
-                if (!remark) {
-                    layer.msg("请填写备注");
-                    return false;
-                }
                 data['refuse'] = remark;
                 data['status'] = 7;
                 $.operate.save(prefix + "/execute", data);
@@ -232,14 +243,9 @@
             },
             btn2: function (index, layero) {
                 var remark = $(layero).find("[name='remark']").val();
-                if (!remark) {
-                    layer.msg("请填写备注");
-                    return false;
-                }
                 data['refuse'] = remark;
                 data['status'] = 8;
                 $.operate.save(prefix + "/execute", data);
-                // return false;
             }
         });
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refundBatch/refundBatch.html

@@ -79,10 +79,9 @@
                 <div class="row">
                     <div class="col-sm-12">
                         <div class="form-group">
-                            <label class="col-xs-2 control-label layui-required">备注：</label>
+                            <label class="col-xs-2 control-label">备注：</label>
                             <div class="col-xs-10">
-                                <textarea name="remark" maxlength="500" class="form-control layui-required"
-                                          rows="3"></textarea>
+                                <textarea name="remark" maxlength="500" class="form-control" rows="3"></textarea>
                             </div>
                         </div>
                     </div>
@@ -96,6 +95,7 @@
 <script th:inline="javascript">
     var detailFlag = [[${@permission.hasPermi('kylin:refundBatch:detail')}]];
     var reviewFlag = [[${@permission.hasPermi('kylin:refundBatch:review')}]];
+    var ticketAuditFlag = [[${@permission.hasPermi('kylin:refundBatch:ticketAudit')}]];
     var executeFlag = [[${@permission.hasPermi('kylin:refundBatch:execute')}]];
     var cancelFlag = [[${@permission.hasPermi('kylin:refundBatch:cancel')}]];
     var reapplyFlag = [[${@permission.hasPermi('kylin:refundBatch:reapply')}]];
@@ -108,16 +108,12 @@
             type: 1,
             fixed: false,
             maxmin: true,
-            title: '一审',
+            title: '运营审核',
             area: ['500px', '220px'],
             content: $("#form-refund-review").html(),
             btn: ["通过", '拒绝'],
             yes: function (index, layero) {
                 var remark = $(layero).find("[name='remark']").val();
-                if (!remark) {
-                    layer.msg("请填写备注");
-                    return false;
-                }
                 data['reject'] = remark;
                 data['status'] = 44;
                 $.operate.save(prefix + "/review", data);
@@ -125,10 +121,6 @@
             },
             btn2: function (index, layero) {
                 var remark = $(layero).find("[name='remark']").val();
-                if (!remark) {
-                    layer.msg("请填写备注");
-                    return false;
-                }
                 data['reject'] = remark;
                 data['status'] = 33;
                 $.operate.save(prefix + "/review", data);
@@ -136,22 +128,39 @@
         });
     }
 
+    function ticketAudit(id) {
+        data = {"refundBatchId": id};
+        layer.open({
+            type: 1,
+            fixed: false,
+            maxmin: true,
+            title: '运营审核',
+            area: ['500px', '220px'],
+            content: $("#form-refund-review").html(),
+            btn: ["确认收货", '没收到，再等等吧～'],
+            yes: function (index, layero) {
+                var remark = $(layero).find("[name='remark']").val();
+                data['ticketRemark'] = remark;
+                data['status'] = 44;
+                $.operate.save(prefix + "/review", data);
+                layer.close(index)
+            },
+            btn2: function (index, layero) {}
+        });
+    }
+
     function execute(id) {
         data = {"refundBatchId": id};
         layer.open({
             type: 1,
             fixed: false,
             maxmin: true,
-            title: '二审',
+            title: '财务审核',
             area: ['500px', '220px'],
             content: $("#form-refund-review").html(),
             btn: ["通过", '拒绝'],
             yes: function (index, layero) {
                 var remark = $(layero).find("[name='remark']").val();
-                if (!remark) {
-                    layer.msg("请填写备注");
-                    return false;
-                }
                 data['refuse'] = remark;
                 data['status'] = 66;
                 $.operate.save(prefix + "/execute", data);
@@ -159,14 +168,9 @@
             },
             btn2: function (index, layero) {
                 var remark = $(layero).find("[name='remark']").val();
-                if (!remark) {
-                    layer.msg("请填写备注");
-                    return false;
-                }
                 data['refuse'] = remark;
                 data['status'] = 55;
                 $.operate.save(prefix + "/execute", data);
-                // return false;
             }
         });
     }
@@ -209,8 +213,9 @@
                         var actions = [];
                         actions.push('<a class="btn btn-info btn-xs' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.refundBatchId + '\')"></i>查看</a> ');
 
-                        actions.push('<a class="btn btn-success btn-xs ' + reviewFlag + '" href="javascript:void(0)" onclick="review(\'' + row.refundBatchId + '\')"></i>一审</a> ');
-                        actions.push('<a class="btn btn-primary btn-xs ' + executeFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.refundBatchId + '\')"></i>二审</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + reviewFlag + '" href="javascript:void(0)" onclick="review(\'' + row.refundBatchId + '\')"></i>运营审核</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + ticketAuditFlag + '" href="javascript:void(0)" onclick="ticketAudit(\'' + row.refundBatchId + '\')"></i>票务审核</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.refundBatchId + '\')"></i>财务审核</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.refundBatchId + '\', \'确定取消退款申请吗？\', table.options.cancelUrl)"></i>取消</a> ');
                         // actions.push('<a class="btn btn-warning btn-xs ' + reapplyFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.refundBatchId + '\', \'确定重新提交退款审核吗？\', table.options.reapplyUrl)"></i>重新提交</a> ');
                         return actions.join('');

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

@@ -223,15 +223,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         }
     }
 
-    /*public Boolean refundPrice(List<String> ticketEntityIds, List<BigDecimal> entitiesPrice, String orderTicketsId) {
-        // 该订单的所有退款单
-        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
-                new QueryWrapper<KylinOrderRefunds>()
-                        .eq("order_tickets_id", orderTicketsId)
-                        .ne("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL)
-        );
-    }*/
-
     public ResponseDto refundCheckStatus(RefundApplyParam refundApplyParam, String authId, String authName) {
         String type = refundApplyParam.getType();
         List<String> orderRefundsIdList = refundApplyParam.getIds();
@@ -259,6 +250,10 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
                 orderType = KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY;
                 break;
+            case "ticketAudit":
+                orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED};
+                orderType = KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY;
+                break;
             case "unfilled":
                 orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};
                 break;

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

@@ -173,13 +173,6 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setApplicantName(authName);
         kylinOrderRefunds.setApplicantAt(LocalDateTime.now());
         kylinOrderRefunds.setReason(reason);
-        if (RefundPriceExpress.compareTo(BigDecimal.ZERO) > 0 && entitiesPriceSum.compareTo(BigDecimal.ZERO) > 0) {
-            kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE3);
-        } else if (RefundPriceExpress.compareTo(BigDecimal.ZERO) > 0) {
-            kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE2);
-        } else if (entitiesPriceSum.compareTo(BigDecimal.ZERO) > 0) {
-            kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE1);
-        }
         kylinOrderRefunds.setCreatedAt(LocalDateTime.now());
         int rows = kylinOrderRefundsMapper.insert(kylinOrderRefunds);
         // 添加缓存

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java

@@ -59,7 +59,6 @@ public class OrderRefundDao implements Serializable {
     private String refuse;
 
     private String refundType;
-    private String refundCate;
 
     private String createdAt;
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefunds.java

@@ -146,7 +146,6 @@ public class KylinOrderRefunds implements Serializable {
      * 票务/快递费/票和快递费
      */
     private String refundType;
-    private Integer refundCate;
 
     private LocalDateTime createdAt;
 

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

@@ -772,7 +772,6 @@ CREATE TABLE `kylin_order_refunds`
     `executor_at`             timestamp      NULL     DEFAULT NULL COMMENT '执行时间',
     `refuse`                  varchar(200)   NOT NULL DEFAULT '' COMMENT '回绝原因',
     `refund_type`             varchar(200)   NOT NULL DEFAULT '' COMMENT '退款方式',
-    `refund_cate`             tinyint        NOT NULL DEFAULT '0' COMMENT '1票务2快递费3票和快递费',
     `created_at`              timestamp      NULL     DEFAULT NULL,
     `updated_at`              timestamp      NULL     DEFAULT NULL,
     PRIMARY KEY (`mid`),

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

@@ -115,7 +115,6 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefunds.setApplicantName(username);
             kylinOrderRefunds.setApplicantAt(time);
             kylinOrderRefunds.setReason(reason);
-            kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE1);
             kylinOrderRefunds.setCreatedAt(time);
 
             KylinOrderRefundsVo orderRefundsVo = KylinOrderRefundsVo.getNew();
@@ -178,8 +177,7 @@ public class KylinRefundsStatusServiceImpl {
                     kylinOrderRefunds.getOrderRefundsId(), kylinOrderRefunds.getOrderTicketsId(), kylinOrderRefunds.getOrderRefundCode(),
                     kylinOrderRefunds.getPrice(), kylinOrderRefunds.getPriceExpress(), kylinOrderRefunds.getPriceCharges(), kylinOrderRefunds.getStatus(),
                     kylinOrderRefunds.getType(), kylinOrderRefunds.getApplicantId(), kylinOrderRefunds.getApplicantName(),
-                    kylinOrderRefunds.getApplicantAt(), kylinOrderRefunds.getReason(),
-                    kylinOrderRefunds.getRefundCate(), kylinOrderRefunds.getCreatedAt()
+                    kylinOrderRefunds.getApplicantAt(), kylinOrderRefunds.getReason(), kylinOrderRefunds.getCreatedAt()
             });
             sqlsDataD.add(new Object[]{
                     kylinOrderRefundEntities.getOrderRefundsEntitiesId(), kylinOrderRefundEntities.getOrderRefundsId(), kylinOrderRefundEntities.getRefundPrice(),

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -28,7 +28,7 @@ kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_pay
 # ------------------------用户发起订单退款----------------------------
 kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,price_charges,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,price_charges,status,type,applicant_id,applicant_name,applicant_at,reason,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
 kylin_order_refund.refundOrderExpress=INSERT INTO kylin_order_express (order_express_id,performances_id,order_tickets_id,order_express_code,mailno,express_type,filter_result,remark,express_status,send_type,send_express_type,express_contacts,express_phone,send_express_address,appointment_time,pro_name,cargo_type_code,limit_type_code,express_type_code,goods_value_total,goods_number,created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
@@ -38,13 +38,6 @@ kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status =
 kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
 
-# ------------------------超时支付申请退款----------------------------
-kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
-
-
 # ------------------------用户转赠相关接口----------------------------
 kylin_order_task.insert = INSERT INTO `kylin_order_task`(`order_id` , `status` , `created_at`) VALUES (? ,? ,?);
 kylin_order_task.delete = DELETE FROM kylin_order_task WHERE order_id = ?;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinRefundsStatusServiceImpl.java

@@ -133,13 +133,6 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setApplicantName(authName);
         kylinOrderRefunds.setApplicantAt(nowTime);
         kylinOrderRefunds.setReason(reason);
-        if (RefundPriceExpress.compareTo(BigDecimal.ZERO) > 0 && entitiesPriceSum.compareTo(BigDecimal.ZERO) > 0) {
-            kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE3);
-        } else if (RefundPriceExpress.compareTo(BigDecimal.ZERO) > 0) {
-            kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE2);
-        } else if (entitiesPriceSum.compareTo(BigDecimal.ZERO) > 0) {
-            kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE1);
-        }
         kylinOrderRefunds.setCreatedAt(nowTime);
 
         KylinOrderRefundsVo orderRefundsVo = KylinOrderRefundsVo.getNew();
@@ -193,7 +186,7 @@ public class KylinRefundsStatusServiceImpl {
                 kylinOrderRefunds.getOrderRefundsId(), kylinOrderRefunds.getOrderTicketsId(), kylinOrderRefunds.getOrderRefundCode(),
                 kylinOrderRefunds.getPrice(), kylinOrderRefunds.getPriceExpress(), kylinOrderRefunds.getStatus(),
                 kylinOrderRefunds.getType(), kylinOrderRefunds.getApplicantId(), kylinOrderRefunds.getApplicantName(),
-                kylinOrderRefunds.getApplicantAt(), kylinOrderRefunds.getReason(), kylinOrderRefunds.getRefundCate(),
+                kylinOrderRefunds.getApplicantAt(), kylinOrderRefunds.getReason(),
                 kylinOrderRefunds.getCreatedAt()
         });
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties

@@ -24,24 +24,11 @@ kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` =
 kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 
-
-# ------------------------用户发起订单退款----------------------------
-kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
-kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
-
-## ------------------------用户发起订单退款撤回----------------------------
-#kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-#kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-#kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
-
 # ------------------------超时支付申请退款----------------------------
 kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_tickets.overtimeRefund=UPDATE kylin_order_tickets SET payment_id = ? , payment_type = ? ,updated_at = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -30,26 +30,6 @@ kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE ord
 kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ?
 kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ?
 
-
-
-# ------------------------用户发起订单退款----------------------------
-kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
-kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
-
-## ------------------------用户发起订单退款撤回----------------------------
-#kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-#kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-#kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
-
-# ------------------------超时支付申请退款----------------------------
-kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
-
 # ------------------------用户关系----------------------------
 sweet_user_relation.insert=INSERT INTO sweet_user_relation (user_id,type,target_id,manual_id,status,created_at) VALUES (?,?,?,?,1,?)
 sweet_user_relation.delete=DELETE FROM  sweet_user_relation WHERE user_id = ? and target_id = ? and manual_id = ? and type = ?