kylin_order_express 增加字段 order_refunds_id 防止多次退款不好查物流

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml

@@ -38,7 +38,7 @@
         FROM kylin_order_refunds AS a
         JOIN kylin_order_tickets AS b ON a.order_tickets_id = b.order_tickets_id
         JOIN kylin_order_ticket_relations AS c ON a.order_tickets_id = c.order_id
-        LEFT JOIN kylin_order_express AS d ON d.order_tickets_id = a.order_tickets_id
+        LEFT JOIN kylin_order_express AS d ON d.order_refunds_id = a.order_refunds_id
         <where>
                 d.send_type = 2
             <if test="orderTicketsId!=''">

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

@@ -875,6 +875,8 @@ alter table kylin_order_express add express_phone varchar(255) not null default
 alter table kylin_order_express add send_express_address varchar(255) not null default '' comment '退票发货快递地址' after express_phone;
 alter table kylin_order_express add appointment_time varchar(255) not null default '' comment '退票发货快递预约取件时间' after send_express_address;
 
+alter table kylin_order_express add order_refunds_id varchar(255)   NOT NULL DEFAULT '' COMMENT 'order_refunds_id' after order_tickets_id;
+
 drop TABLE if exists `kylin_order_express_fee_info`;
 CREATE TABLE `kylin_order_express_fee_info`
 (

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

@@ -251,7 +251,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             if (!orderRefundId.isEmpty()) {
                 // 退款申请成功 异步去快递下单
                 if (orderTicketVo.getGetTicketType().equals("express") && sendExpressType > 0) {// 快递票
-                    expressPlace(sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo);
+                    expressPlace(sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo, orderRefundId);
                 }
 
                 HashMap<String, String> map = CollectionUtil.mapStringString();
@@ -313,7 +313,7 @@ public class KylinOrderTicketsRefundServiceImpl {
     }
 
     @Async
-    public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo) {
+    public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo, String orderRefundId) {
         expressContacts = (null == expressContacts) ? "" : expressContacts;
         expressPhone = (null == expressPhone) ? "" : expressPhone;
         sendExpressAddress = (null == sendExpressAddress) ? "" : sendExpressAddress;
@@ -384,7 +384,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 goodsValueTotal = (null == goodsValueTotal) ? "" : goodsValueTotal;
                 goodsNumber = (null == goodsNumber) ? "" : goodsNumber;
                 sqlsDataA.add(new Object[]{
-                        orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), OrderExpressCode, hashMapResult.get("mailno"), expressType, hashMapResult.get("filter_result"), remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
+                        orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), orderRefundId, OrderExpressCode, hashMapResult.get("mailno"), expressType, hashMapResult.get("filter_result"), remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
                         , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
                         , proName, hashMapResult.get("cargoTypeCode"), hashMapResult.get("limitTypeCode"), hashMapResult.get("expressTypeCode"), goodsValueTotal, goodsNumber
                         , now
@@ -410,7 +410,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
             LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
             sqlsDataA.add(new Object[]{
-                    orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), OrderExpressCode, expressNumber, expressType, "", "", KylinTableStatusConst.ORDER_EXPRESS_STATUS2
+                    orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), orderRefundId, OrderExpressCode, expressNumber, expressType, "", "", KylinTableStatusConst.ORDER_EXPRESS_STATUS2
                     , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
                     , "", "", "", "", "", ""
                     , now

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

@@ -31,7 +31,7 @@ kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_pay
 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 (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_refund.refundOrderExpress=INSERT INTO kylin_order_express (order_express_id,performances_id,order_tickets_id,order_refunds_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 (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 # ------------------------用户发起订单退款撤回----------------------------
 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)