修改客诉bug

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -282,185 +282,100 @@
     FROM
     tb_rst_customer_info c
     LEFT JOIN (
+    (
     SELECT
     '3' AS customerIsSolve,
     renewed_id AS relationId,
     customer_id AS customerId,
     tb_rst_relation_order.sales_id AS orderId,
     signclosed_id AS signclosedId,
-    renewed_back_efast_order_id AS relationBackEfastOrderId,
-    renewed_back_name AS relationBackName,
-    renewed_back_tel AS relationBackTel,
     renewed_back_status AS relationBackStatus,
-    renewed_back_logistics_company AS relationBackLogisticsCompany,
-    renewed_back_logistics_no AS relationBackLogisticsNo,
-    renewed_back_postage AS relationBackPostage,
-    renewed_back_machine_no AS relationBackMachineNo,
     renewed_send_status AS relationSendStatus,
-    renewed_send_name AS relationSendName,
-    renewed_send_tel AS relationSendTel,
-    province_number AS provinceNumber,
-    city_number AS cityNumber,
-    area_number AS areaNumber,
-    renewed_send_merge_address AS relationSendMergeAddress,
-    renewed_send_address AS relationSendAddress,
-    renewed_send_logistics_company AS relationSendLogisticsCompany,
     renewed_send_logistics_no AS relationSendLogisticsNo,
-    renewed_desc AS relationDesc,
-    renewed_state AS relationState,
-    renewed_alipay AS relationAlipay,
-    renewed_is_transfer AS relationIsTransfer,
-    renewed_alipay_name AS relationAlipayName,
-    renewed_back_receipt_date AS relationBackReceiptDate
+    renewed_send_logistics_company AS relationSendLogisticsCompany,
+    renewed_back_logistics_no AS relationBackLogisticsNo,
+    renewed_back_logistics_company AS relationBackLogisticsCompany
     FROM
     tb_rst_renewed
     LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_renewed.renewed_id
-    WHERE
-    tb_rst_relation_order.relation_type = '3'
+    AND tb_rst_relation_order.relation_type = '3'
+    )
     UNION ALL
+    (
     SELECT
     '4' AS customerIsSolve,
     repair_id AS relationId,
     customer_id AS customerId,
     tb_rst_relation_order.sales_id AS orderId,
     signclosed_id AS signclosedId,
-    repair_back_efast_order_id AS relationBackEfastOrderId,
-    repair_back_name AS relationBackName,
-    repair_back_tel AS relationBackTel,
     repair_back_status AS relationBackStatus,
-    repair_back_logistics_company AS relationBackLogisticsCompany,
-    repair_back_logistics_no AS relationBackLogisticsNo,
-    repair_back_postage AS relationBackPostage,
-    repair_back_machine_no AS relationBackMachineNo,
     repair_send_status AS relationSendStatus,
-    repair_send_name AS relationSendName,
-    repair_send_tel AS relationSendTel,
-    province_number AS provinceNumber,
-    city_number AS cityNumber,
-    area_number AS areaNumber,
-    repair_send_merge_address AS relationSendMergeAddress,
-    repair_send_address AS relationSendAddress,
-    repair_send_logistics_company AS relationSendLogisticsCompany,
     repair_send_logistics_no AS relationSendLogisticsNo,
-    repair_desc AS relationDesc,
-    repair_state AS relationState,
-    repair_alipay AS relationAlipay,
-    repair_is_transfer AS relationIsTransfer,
-    repair_alipay_name AS relationAlipayName,
-    repair_back_receipt_date AS relationBackReceiptDate
+    repair_send_logistics_company AS relationSendLogisticsCompany,
+    repair_back_logistics_no AS relationBackLogisticsNo,
+    repair_back_logistics_company AS relationBackLogisticsCompany
     FROM
     tb_rst_repair
     LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_repair.repair_id
-    WHERE
-    tb_rst_relation_order.relation_type = '4'
+    AND tb_rst_relation_order.relation_type = '4'
+    )
     UNION ALL
+    (
     SELECT
     '5' AS customerIsSolve,
     reissue_id AS relationId,
     customer_id AS customerId,
     tb_rst_relation_order.sales_id AS orderId,
     NULL AS signclosedId,
-    reissue_back_efast_order_id AS relationBackEfastOrderId,
-    NULL AS relationBackName,
-    NULL AS relationBackTel,
     NULL AS relationBackStatus,
-    NULL AS relationBackLogisticsCompany,
-    NULL AS relationBackLogisticsNo,
-    NULL AS relationBackPostage,
-    NULL AS relationBackMachineNo,
     reissue_send_status AS relationSendStatus,
-    reissue_send_name AS relationSendName,
-    reissue_send_tel AS relationSendTel,
-    province_number AS provinceNumber,
-    city_number AS cityNumber,
-    area_number AS areaNumber,
-    reissue_send_merge_address AS relationSendMergeAddress,
-    reissue_send_address AS relationSendAddress,
-    reissue_send_logistics_company AS relationSendLogisticsCompany,
     reissue_send_logistics_no AS relationSendLogisticsNo,
-    reissue_desc AS relationDesc,
-    reissue_state AS relationState,
-    NULL AS relationAlipay,
-    NULL AS relationIsTransfer,
-    NULL AS relationAlipayName,
-    NULL AS relationBackReceiptDate
+    reissue_send_logistics_company AS relationSendLogisticsCompany,
+    NULL AS relationBackLogisticsNo,
+    NULL AS relationBackLogisticsCompany
     FROM
     tb_rst_reissue
     LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_reissue.reissue_id
-    WHERE
-    tb_rst_relation_order.relation_type = '5'
+    AND tb_rst_relation_order.relation_type = '5'
+    )
     UNION ALL
+    (
     SELECT
     '6' AS customerIsSolve,
     back_goods_id AS relationId,
     customer_id AS customerId,
     tb_rst_relation_order.sales_id AS orderId,
     signclosed_id AS signclosedId,
-    NULL AS relationBackEfastOrderId,
-    back_goods_back_name AS relationBackName,
-    back_goods_back_tel AS relationBackTel,
     back_goods_back_status AS relationBackStatus,
-    back_goods_back_logistics_company AS relationBackLogisticsCompany,
-    back_goods_back_logistics_no AS relationBackLogisticsNo,
-    back_goods_back_postage AS relationBackPostage,
-    back_goods_back_machine_no AS relationBackMachineNo,
     NULL AS relationSendStatus,
-    NULL AS relationSendName,
-    NULL AS relationSendTel,
-    NULL AS provinceNumber,
-    NULL AS cityNumber,
-    NULL AS areaNumber,
-    NULL AS relationSendMergeAddress,
-    NULL AS relationSendAddress,
-    NULL AS relationSendLogisticsCompany,
     NULL AS relationSendLogisticsNo,
-    back_goods_desc AS relationDesc,
-    back_goods_state AS relationState,
-    back_goods_alipay AS relationAlipay,
-    back_goods_is_transfer AS relationIsTransfer,
-    back_goods_alipay_name AS relationAlipayName,
-    back_goods_back_receipt_date AS relationBackReceiptDate
+    NULL AS relationSendLogisticsCompany,
+    back_goods_back_logistics_no AS relationBackLogisticsNo,
+    back_goods_back_logistics_company AS relationBackLogisticsCompany
     FROM
     tb_rst_back_goods
     LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_back_goods.back_goods_id
-    WHERE
-    tb_rst_relation_order.relation_type = '6'
+    AND tb_rst_relation_order.relation_type = '6'
+    )
     UNION ALL
+    (
     SELECT
     '7' AS customerIsSolve,
     noreason_back_id AS relationId,
     customer_id AS customerId,
     tb_rst_relation_order.sales_id AS orderId,
     signclosed_id AS signclosedId,
-    NULL AS relationBackEfastOrderId,
-    noreason_back_back_name AS relationBackName,
-    noreason_back_back_tel AS relationBackTel,
     noreason_back_back_status AS relationBackStatus,
-    noreason_back_back_logistics_company AS relationBackLogisticsCompany,
-    noreason_back_back_logistics_no AS relationBackLogisticsNo,
-    noreason_back_back_postage AS relationBackPostage,
-    noreason_back_back_machine_no AS relationBackMachineNo,
     NULL AS relationSendStatus,
-    NULL AS relationSendName,
-    NULL AS relationSendTel,
-    NULL AS provinceNumber,
-    NULL AS cityNumber,
-    NULL AS areaNumber,
-    NULL AS relationSendMergeAddress,
-    NULL AS relationSendAddress,
-    NULL AS relationSendLogisticsCompany,
     NULL AS relationSendLogisticsNo,
-    noreason_back_desc AS relationDesc,
-    noreason_back_state AS relationState,
-    noreason_back_alipay AS relationAlipay,
-    noreason_back_is_transfer AS relationIsTransfer,
-    noreason_back_alipay_name AS relationAlipayName,
-    noreason_back_receipt_date AS relationBackReceiptDate
+    NULL AS relationSendLogisticsCompany,
+    noreason_back_back_logistics_no AS relationBackLogisticsNo,
+    noreason_back_back_logistics_company AS relationBackLogisticsCompany
     FROM
     tb_rst_noreason_back
     LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_noreason_back.noreason_back_id
-    WHERE
-    tb_rst_relation_order.relation_type = '7'
+    AND tb_rst_relation_order.relation_type = '7'
+    )
     ) cc ON cc.customerId = c.customer_id
     LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sales_order_info oi ON cc.orderId = oi.sales_id