feat: 易名

c5c7a334 · Sxy · 71489634 · c5c7a334 · c5c7a334 · c5c7a334
Commit c5c7a334 authored Mar 10, 2021 by Sxy
28 changed files
--- a/icp-deliver/app/base/controller/impl/delivery/deliverCtl.js
+++ b/icp-deliver/app/base/controller/impl/delivery/deliverCtl.js
@@ -172,6 +172,18 @@ class DeliverCtl extends CtlBase {
        }
    }

+    async toUpload(pobj) {
+        if (!pobj.id) {
+            return system.getResult(null, "id  can not be empty，100290");
+        }
+        try {
+            let rs = await this.service.toUpload(pobj);
+            return system.getResult(rs);
+        } catch (err) {
+            return system.getResult(null, err.message)
+        }
+    }
+
    async findRelationOrder(pobj) {
        if (!pobj.id) {
            return system.getResult(null, "deliver_id  can not be empty，100290");

--- a/icp-deliver/app/base/service/impl/delivery/deliverSve.js
+++ b/icp-deliver/app/base/service/impl/delivery/deliverSve.js
@@ -217,6 +217,40 @@ class DeliverService extends ServiceBase {
    }

    /**
+     * 易名 渠道 专用
+     * 记录 上传步骤 
+     * @param {*} pobj 
+     */
+    async toUpload(pobj) {
+        const deliverData = await this.dao.findOne({
+            id: pobj.id
+        });
+        if (!deliverData) {
+            throw new Error("没有此交付单");
+        }
+        if (system.SERVERSESTATUS.COLLECTING === deliverData.delivery_status && deliverData.source_number === "ename") {
+            await pushQft.changeStatus(deliverData, 505);
+            let status;
+            status = system.SERVERSESTATUS.FILLING
+            await this.dao.updateByWhere({
+                delivery_status: status
+            }, {
+                id: pobj.id
+            });
+            this.statuslogDao.create({
+                flow_type: system.FLOWCODE.DELIVERY,
+                flow_id: pobj.id,
+                status_code: status,
+                salesman_id: pobj.userid,
+                salesman_name: pobj.username
+            });
+        }
+
+        return "SUCCESS"
+    }
+
+
+    /**
        * 1. 保存资质信息
    */
    async addQualification(pobj) {

--- a/icp-deliver/app/base/service/impl/delivery/newdeliverSve.js
+++ b/icp-deliver/app/base/service/impl/delivery/newdeliverSve.js
@@ -33,14 +33,14 @@ class NewdeliverService extends ServiceBase {
        if (!deliverData) {
            throw new Error("查不到此交付单");
        }
-        if ([system.SERVERSESTATUS.COLLECTING, system.SERVERSESTATUS.USERCONFIRMATIONREJECT].includes(deliverData.delivery_status)) {
+        if ([system.SERVERSESTATUS.COLLECTING, system.SERVERSESTATUS.USERCONFIRMATIONREJECT, system.SERVERSESTATUS.FILLING].includes(deliverData.delivery_status)) {
            await TOQFT.getClientByType(deliverData.product_code).submitMaterials(pobj.username, deliverData, pobj.cache_info);
        }

        return this.db.transaction(async (t) => {
            await this.cacheinfoDao.createOrUpdate(pobj, t);
            await this.newmaterialDao.createOrUpdate(pobj, t);
-            if ([system.SERVERSESTATUS.COLLECTING, system.SERVERSESTATUS.USERCONFIRMATIONREJECT].includes(deliverData.delivery_status)) {
+            if ([system.SERVERSESTATUS.COLLECTING, system.SERVERSESTATUS.USERCONFIRMATIONREJECT, system.SERVERSESTATUS.FILLING].includes(deliverData.delivery_status)) {
                let status;
                if (deliverData.source_number === "aliCloud") {
                    status = system.SERVERSESTATUS.USERCONFIRMATIONWAIT

--- a/icp-deliver/app/base/system.js
+++ b/icp-deliver/app/base/system.js
@@ -381,7 +381,9 @@ System.SERVERSESTATUS = {

 	AUDITING: "auditing",// 工商审核环节
 	ENGRAVING: "engraving",// 刻章环节
-	SERVICEING: "serviceing" // 服务中
+	SERVICEING: "serviceing", // 服务中
+
+	FILLING: "filling" //填写资料中 （易名渠道）
 }
 // 年报服务单状态
 System.ANNUALREPORT = {

--- a/icp-deliver/app/base/utils/toQft/baseClient.js
+++ b/icp-deliver/app/base/utils/toQft/baseClient.js
@@ -26,7 +26,7 @@ class BaseClient {
        return await this.postRequest(`${qifutongUrl}${this.url}`, data, header);
    }

-    async getLoginByUserName(user) {
+    async getLoginByUserName(user = 'icp-deliver') {
        const token = await this.getAppTokenByAppKey(this.appKey, this.secret);
        const data = await this.postRequest(`${centerChannelUrl}/api/opreceive/accessAuth/springBoard`, {
            "actionType": "getLoginByUserName",

--- a/icp-deliver/app/base/utils/toQft/vatClient.js
+++ b/icp-deliver/app/base/utils/toQft/vatClient.js
@@ -49,6 +49,17 @@ class VatClient extends BaseClient {
            partnerSignAndStampOtherList, partnerSignOtherList,
            businessDevelopmentForm, partnerStampOtherList
        } = materialFile;
+
+        if (deliverData.source_number === "ename") {
+            await this.pushQiFuTong(username, {
+                actionType: "serviceProviderNotification",
+                actionBody: {
+                    orderNo: deliverData.delivery_code,
+                    status: 506,
+                }
+            });
+        }
+
        await this.pushQiFuTong(username, {
            actionType: "serviceProviderSubmitMaterial",
            actionBody: {

--- a/icp-deliver/app/base/utils/toqifutongClient.js
+++ b/icp-deliver/app/base/utils/toqifutongClient.js
@@ -33,7 +33,7 @@ const getAppTokenByAppKey = async (appKey, secret) => {
    return data.token
 }

-const getLoginByUserName = async (mobile, appKey, secret) => {
+const getLoginByUserName = async (mobile = 'icp-deliver', appKey, secret) => {
    const token = await getAppTokenByAppKey(appKey, secret);
    const data = await postRequest(`${centerChannelUrl}/api/opreceive/accessAuth/springBoard`,
        {

--- a/icp-deliver/app/front/entry/public/index.html
+++ b/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.5f70d3a5.js rel=prefetch><link href=/js/chunk-06449399.2a5ea4f2.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.8bc302aa.js rel=prefetch><link href=/js/chunk-2d0cf4f6.930c0c8e.js rel=prefetch><link href=/js/chunk-2d207793.7f6ec1fa.js rel=prefetch><link href=/js/chunk-2d80dec8.478cd215.js rel=prefetch><link href=/js/chunk-30067b72.4c86bcc5.js rel=prefetch><link href=/js/chunk-3385141a.4196a0cf.js rel=prefetch><link href=/js/chunk-35b9ac48.f419677f.js rel=prefetch><link href=/js/chunk-39350a7d.9cd00e86.js rel=prefetch><link href=/js/chunk-398d1f6d.506322d9.js rel=prefetch><link href=/js/chunk-48fe381e.9c15adc8.js rel=prefetch><link href=/js/chunk-49422a07.e7276947.js rel=prefetch><link href=/js/chunk-4ae71dac.3b61e939.js rel=prefetch><link href=/js/chunk-4d7ab9dc.3ceee29b.js rel=prefetch><link href=/js/chunk-5081ca8a.edd6c2c5.js rel=prefetch><link href=/js/chunk-56e8c04c.8fa6a0cd.js rel=prefetch><link href=/js/chunk-5bc407fb.f1401c25.js rel=prefetch><link href=/js/chunk-6bdf6350.7d48335a.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.4c915ab8.js rel=prefetch><link href=/js/chunk-a0112c24.17403f22.js rel=prefetch><link href=/js/chunk-b9fae8ec.f714c8e7.js rel=prefetch><link href=/js/chunk-c34f7952.c13904b7.js rel=prefetch><link href=/js/chunk-e9d6290c.4a03ba80.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.5a3a305f.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.5a3a305f.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.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.1196cd00.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.566ad95c.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.566ad95c.js></script></body></html>
\ No newline at end of file
--- a/icp-deliver/app/front/entry/public/js/app.5a3a305f.js
+++ b/icp-deliver/app/front/entry/public/js/app.5a3a305f.js
--- a/icp-deliver/app/front/entry/public/js/chunk-0203d194.5f70d3a5.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-0203d194.5f70d3a5.js
--- a/icp-deliver/app/front/entry/public/js/chunk-06449399.2a5ea4f2.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-06449399.2a5ea4f2.js
--- a/icp-deliver/app/front/entry/public/js/chunk-2d0c9156.8bc302aa.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-2d0c9156.8bc302aa.js
--- a/icp-deliver/app/front/entry/public/js/chunk-2d0cf4f6.930c0c8e.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-2d0cf4f6.930c0c8e.js
--- a/icp-deliver/app/front/entry/public/js/chunk-2d80dec8.478cd215.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-2d80dec8.478cd215.js
--- a/icp-deliver/app/front/entry/public/js/chunk-30067b72.4c86bcc5.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-30067b72.4c86bcc5.js
--- a/icp-deliver/app/front/entry/public/js/chunk-35b9ac48.f419677f.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-35b9ac48.f419677f.js
--- a/icp-deliver/app/front/entry/public/js/chunk-39350a7d.9cd00e86.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-39350a7d.9cd00e86.js
--- a/icp-deliver/app/front/entry/public/js/chunk-398d1f6d.506322d9.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-398d1f6d.506322d9.js
--- a/icp-deliver/app/front/entry/public/js/chunk-48fe381e.9c15adc8.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-48fe381e.9c15adc8.js
--- a/icp-deliver/app/front/entry/public/js/chunk-4ae71dac.3b61e939.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-4ae71dac.3b61e939.js
--- a/icp-deliver/app/front/entry/public/js/chunk-4d7ab9dc.3ceee29b.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-4d7ab9dc.3ceee29b.js
--- a/icp-deliver/app/front/entry/public/js/chunk-56e8c04c.8fa6a0cd.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-56e8c04c.8fa6a0cd.js
--- a/icp-deliver/app/front/entry/public/js/chunk-5bc407fb.f1401c25.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-5bc407fb.f1401c25.js
--- a/icp-deliver/app/front/entry/public/js/chunk-6bdf6350.7d48335a.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-6bdf6350.7d48335a.js
--- a/icp-deliver/app/front/entry/public/js/chunk-7ab13672.4c915ab8.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-7ab13672.4c915ab8.js
--- a/icp-deliver/app/front/entry/public/js/chunk-a0112c24.17403f22.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-a0112c24.17403f22.js
--- a/icp-deliver/app/front/entry/public/js/chunk-b9fae8ec.f714c8e7.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-b9fae8ec.f714c8e7.js
--- a/icp-deliver/app/front/entry/public/js/chunk-e9d6290c.4a03ba80.js
+++ b/icp-deliver/app/front/entry/public/js/chunk-e9d6290c.4a03ba80.js