build: 易名添加关闭

icp-deliver/app/base/service/impl/delivery/deliverSve.js

@@ -288,27 +288,27 @@ class DeliverService extends ServiceBase {
     // });
     // 推送 退费
     // await pushTx.returnPremium(deliverData.delivery_code);
-        await pushQft.closeDelivery(deliverData, {
+    await pushQft.enamecloseDelivery(deliverData, {
       note: pobj.close_reason
     })
     // 年报逻辑
-        let annualReportData;
-        if (deliverData.master_source_number) {
-            annualReportData = await this.dao.findOne({
-                master_source_number: deliverData.master_source_number,
-                id: {
-                    $ne: deliverData.id
-                }
-            });
-            // 推送 关闭交付 资质
-            if (annualReportData) {
-                // await pushTx.pushChangeOrder(pushTx.TXSTATUS.CLOSED, annualReportData.delivery_code, {
-                //     close_reason: "对应的资质交付关闭了"
+    // let annualReportData;
+    // if (deliverData.master_source_number) {
+    //     annualReportData = await this.dao.findOne({
+    //         master_source_number: deliverData.master_source_number,
+    //         id: {
+    //             $ne: deliverData.id
+    //         }
     //     });
-                // 推送 年报退费
-                // await pushTx.returnPremium(annualReportData.delivery_code);
-            }
-        }
+    //     // 推送 关闭交付 资质
+    //     if (annualReportData) {
+    //         // await pushTx.pushChangeOrder(pushTx.TXSTATUS.CLOSED, annualReportData.delivery_code, {
+    //         //     close_reason: "对应的资质交付关闭了"
+    //         // });
+    //         // 推送 年报退费
+    //         // await pushTx.returnPremium(annualReportData.delivery_code);
+    //     }
+    // }
     return this.db.transaction(async (t) => {
       await this.dao.updateByWhere({
         delivery_status: system.SERVERSESTATUS.CLOSED,
@@ -323,21 +323,21 @@ class DeliverService extends ServiceBase {
         salesman_id: pobj.userid,
         salesman_name: pobj.username
       });
-            if (annualReportData) {
-                await this.dao.updateByWhere({
-                    delivery_status: system.SERVERSESTATUS.CLOSED,
-                    close_reason: "对应的资质交付关闭了"
-                }, {
-                    id: annualReportData.id
-                }, t);
-                this.statuslogDao.create({
-                    flow_type: system.FLOWCODE.DELIVERY,
-                    flow_id: annualReportData.id,
-                    status_code: system.SERVERSESTATUS.CLOSED,
-                    salesman_id: pobj.userid,
-                    salesman_name: pobj.username
-                });
-            }
+      // if (annualReportData) {
+      //     await this.dao.updateByWhere({
+      //         delivery_status: system.SERVERSESTATUS.CLOSED,
+      //         close_reason: "对应的资质交付关闭了"
+      //     }, {
+      //         id: annualReportData.id
+      //     }, t);
+      //     this.statuslogDao.create({
+      //         flow_type: system.FLOWCODE.DELIVERY,
+      //         flow_id: annualReportData.id,
+      //         status_code: system.SERVERSESTATUS.CLOSED,
+      //         salesman_id: pobj.userid,
+      //         salesman_name: pobj.username
+      //     });
+      // }
       return "success"
     });
 

icp-deliver/app/base/utils/toqifutongClient.js

@@ -264,7 +264,21 @@ const closeDelivery = async (deliverData, sendMessage = {}) => {
         actionType: "closeOrderDelivery",
         actionBody: {
             orderNo: deliverData.delivery_code,         //订单号 必填
-            // officialFileURL: ""                      //官文url 非必填
+            ...sendMessage
+        }
+    });
+}
+
+/**
+ * 易名关闭交付单
+ * @param {*} deliverData 
+ * @param {*} sendMessage 关闭理由
+ */
+const enamecloseDelivery = async (deliverData, sendMessage = {}) => {
+    await pushQiFuTong(deliverData.salesman_phone, {
+        actionType: "eNameCloseOrder",
+        actionBody: {
+            orderNo: deliverData.delivery_code,         //订单号 必填
             ...sendMessage
         }
     });
@@ -365,5 +379,6 @@ module.exports = {
     changeStatus,
     closeDelivery,
     batchCreateBiz,
-    wangwenSubmitOption
+    wangwenSubmitOption,
+    enamecloseDelivery
 }
\ No newline at end of file

icp-deliver/app/front/entry/public/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-0203d194.1543a0bd.css rel=prefetch><link href=/css/chunk-06449399.2716bee1.css rel=prefetch><link href=/css/chunk-0f7b6361.8797b2b5.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-30067b72.9f138c53.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-35b9ac48.18623bb6.css rel=prefetch><link href=/css/chunk-39350a7d.3a534050.css rel=prefetch><link href=/css/chunk-48fe381e.18623bb6.css rel=prefetch><link href=/css/chunk-4ae71dac.18623bb6.css rel=prefetch><link href=/css/chunk-56e8c04c.dc485f9d.css rel=prefetch><link href=/css/chunk-5bc407fb.c315c3ce.css rel=prefetch><link href=/css/chunk-6bdf6350.e4a5d5d6.css rel=prefetch><link href=/css/chunk-7a27e9e6.1e75f0e2.css rel=prefetch><link href=/css/chunk-7ab13672.1543a0bd.css rel=prefetch><link href=/css/chunk-a0112c24.dce456a2.css rel=prefetch><link href=/css/chunk-b9fae8ec.18623bb6.css rel=prefetch><link href=/js/chunk-0203d194.c1ab3376.js rel=prefetch><link href=/js/chunk-06449399.4f005801.js rel=prefetch><link href=/js/chunk-0f7b6361.472a82d4.js rel=prefetch><link href=/js/chunk-14b9857b.3c96aac0.js rel=prefetch><link href=/js/chunk-2c359864.c7400e66.js rel=prefetch><link href=/js/chunk-2d0c9156.815283e4.js rel=prefetch><link href=/js/chunk-2d0cf4f6.3fb8a73d.js rel=prefetch><link href=/js/chunk-2d207793.7f6ec1fa.js rel=prefetch><link href=/js/chunk-2d80dec8.45a95db4.js rel=prefetch><link href=/js/chunk-30067b72.41e079fd.js rel=prefetch><link href=/js/chunk-3385141a.4196a0cf.js rel=prefetch><link href=/js/chunk-35b9ac48.d2035849.js rel=prefetch><link href=/js/chunk-39350a7d.a41bfd7c.js rel=prefetch><link href=/js/chunk-398d1f6d.d82cbb99.js rel=prefetch><link href=/js/chunk-48fe381e.bc346128.js rel=prefetch><link href=/js/chunk-49422a07.e7276947.js rel=prefetch><link href=/js/chunk-4ae71dac.237cb8ff.js rel=prefetch><link href=/js/chunk-4d7ab9dc.827f7e4c.js rel=prefetch><link href=/js/chunk-5081ca8a.edd6c2c5.js rel=prefetch><link href=/js/chunk-56e8c04c.65255ce3.js rel=prefetch><link href=/js/chunk-5bc407fb.9bf281cb.js rel=prefetch><link href=/js/chunk-6bdf6350.d2b43d2a.js rel=prefetch><link href=/js/chunk-722597e0.a6ce8549.js rel=prefetch><link href=/js/chunk-7a27e9e6.c6a558bb.js rel=prefetch><link href=/js/chunk-7ab13672.91fa5af8.js rel=prefetch><link href=/js/chunk-a0112c24.36e91ea9.js rel=prefetch><link href=/js/chunk-b9fae8ec.47b904f3.js rel=prefetch><link href=/js/chunk-c34f7952.c13904b7.js rel=prefetch><link href=/js/chunk-e9d6290c.d02faae2.js rel=prefetch><link href=/css/app.b5dfd3c8.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.0393b716.js rel=preload as=script><link href=/js/chunk-vendors.46323cf4.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.b5dfd3c8.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.46323cf4.js></script><script src=/js/app.0393b716.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-0203d194.1543a0bd.css rel=prefetch><link href=/css/chunk-06449399.2716bee1.css rel=prefetch><link href=/css/chunk-0f7b6361.8797b2b5.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-30067b72.9f138c53.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-35b9ac48.18623bb6.css rel=prefetch><link href=/css/chunk-39350a7d.3a534050.css rel=prefetch><link href=/css/chunk-48fe381e.18623bb6.css rel=prefetch><link href=/css/chunk-4ae71dac.18623bb6.css rel=prefetch><link href=/css/chunk-56e8c04c.dc485f9d.css rel=prefetch><link href=/css/chunk-5bc407fb.c315c3ce.css rel=prefetch><link href=/css/chunk-6bdf6350.e4a5d5d6.css rel=prefetch><link href=/css/chunk-7a27e9e6.1e75f0e2.css rel=prefetch><link href=/css/chunk-7ab13672.1543a0bd.css rel=prefetch><link href=/css/chunk-a0112c24.dce456a2.css rel=prefetch><link href=/css/chunk-b9fae8ec.18623bb6.css rel=prefetch><link href=/js/chunk-0203d194.c1ab3376.js rel=prefetch><link href=/js/chunk-06449399.4f005801.js rel=prefetch><link href=/js/chunk-0f7b6361.472a82d4.js rel=prefetch><link href=/js/chunk-14b9857b.3c96aac0.js rel=prefetch><link href=/js/chunk-2c359864.c7400e66.js rel=prefetch><link href=/js/chunk-2d0c9156.815283e4.js rel=prefetch><link href=/js/chunk-2d0cf4f6.3fb8a73d.js rel=prefetch><link href=/js/chunk-2d207793.7f6ec1fa.js rel=prefetch><link href=/js/chunk-2d80dec8.45a95db4.js rel=prefetch><link href=/js/chunk-30067b72.41e079fd.js rel=prefetch><link href=/js/chunk-3385141a.4196a0cf.js rel=prefetch><link href=/js/chunk-35b9ac48.d2035849.js rel=prefetch><link href=/js/chunk-39350a7d.a41bfd7c.js rel=prefetch><link href=/js/chunk-398d1f6d.d82cbb99.js rel=prefetch><link href=/js/chunk-48fe381e.bc346128.js rel=prefetch><link href=/js/chunk-49422a07.e7276947.js rel=prefetch><link href=/js/chunk-4ae71dac.237cb8ff.js rel=prefetch><link href=/js/chunk-4d7ab9dc.827f7e4c.js rel=prefetch><link href=/js/chunk-5081ca8a.edd6c2c5.js rel=prefetch><link href=/js/chunk-56e8c04c.65255ce3.js rel=prefetch><link href=/js/chunk-5bc407fb.a12a1aad.js rel=prefetch><link href=/js/chunk-6bdf6350.d2b43d2a.js rel=prefetch><link href=/js/chunk-722597e0.a6ce8549.js rel=prefetch><link href=/js/chunk-7a27e9e6.c6a558bb.js rel=prefetch><link href=/js/chunk-7ab13672.91fa5af8.js rel=prefetch><link href=/js/chunk-a0112c24.36e91ea9.js rel=prefetch><link href=/js/chunk-b9fae8ec.47b904f3.js rel=prefetch><link href=/js/chunk-c34f7952.c13904b7.js rel=prefetch><link href=/js/chunk-e9d6290c.d02faae2.js rel=prefetch><link href=/css/app.b5dfd3c8.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.95032d6a.js rel=preload as=script><link href=/js/chunk-vendors.46323cf4.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.b5dfd3c8.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.46323cf4.js></script><script src=/js/app.95032d6a.js></script></body></html>
\ No newline at end of file