gsb

xgg-deliver/app/base/controller/ctl.base.js

@@ -7,6 +7,17 @@ class CtlBase {
     this.cacheManager = system.getObject("db.common.cacheManager");
     this.md5 = require("MD5");
   }
+  async getDeliver(req) {
+    let jo = await redisClient.get(req.sid + "_deliver");
+    if (!jo) {
+      return null;
+    }
+    try {
+      return JSON.parse(jo);
+    } catch (e) {
+      return null;
+    }
+  }
   encryptPasswd(passwd) {
     if (!passwd) {
       throw new Error("请输入密码");

xgg-deliver/app/base/controller/ctlms.base.js

 const system = require("../system");
 const settings = require("../../config/settings");
+const redisClient = system.getObject("util.redisClient");
 class CtlBase {
   constructor() {
     this.restClient = system.getObject("util.restClient");
@@ -13,6 +14,17 @@ class CtlBase {
       return system.getResultFail(-200, "Ctl出现异常，请联系管理员");
     }
   }
+  async getDeliver(req) {
+    let jo = await redisClient.get(req.sid + "_deliver");
+    if (!jo) {
+      return null;
+    }
+    try {
+      return JSON.parse(jo);
+    } catch (e) {
+      return null;
+    }
+  }
   encryptPasswd(passwd) {
     if (!passwd) {
       throw new Error("请输入密码");

xgg-deliver/app/base/controller/impl/order/orderCtl.js

-var system = require("../../../system")
+const system = require("../../../system")
+const settings = require("../../../../config/settings")
 const CtlBase = require("../../ctlms.base");
+const moment = require("moment");
 class OrderCtl extends CtlBase {
   constructor() {
     super();
     this.orderSve = system.getObject("service.order.orderSve");
     this.deliverSve = system.getObject("service.common.deliverSve");
+
+    this.businessmenSve = system.getObject("service.business.businessmenSve");
   }
 
   async processList(pobj, pobj2, req) {
@@ -167,9 +171,15 @@ class OrderCtl extends CtlBase {
    * @param {*} req 
    */
   async businessRegisterComplete(pobj, pobj2, req) {
+    let deliver = await this.getDeliver(req);
+    if (!deliver) {
+      return system.getResult(null, `登录信息错误，请重新登录`);
+    }
+
     if (!pobj.id) {
       return system.getResult(null, `参数错误 订单ID不能为空`);
     }
+
     if (!pobj.status) {
       return system.getResult(null, `参数错误 状态码不能为空`);
     }
@@ -200,6 +210,8 @@ class OrderCtl extends CtlBase {
       return system.getResult(null,`请重新登录`);
     }
     pobj.deliver_id = pobj.deliver_id;
+    pobj.company_id = deliver.nt_company_id;
+
     try {
       return await this.orderSve.handleStatus(pobj);
     } catch (error) {
@@ -584,6 +596,11 @@ class OrderCtl extends CtlBase {
    * @returns {Promise<void>}
    */
   async accountCreation (pobj, pobj2, req){
+    let deliver = await this.getDeliver(req);
+    if (!deliver) {
+      return system.getResult(null, `登录信息错误，请重新登录`);
+    }
+
     if(!pobj.id){
       return system.getResult(null,`订单【${pobj.id}】不存在`)
     }
@@ -596,68 +613,58 @@ class OrderCtl extends CtlBase {
     try {
       let rs = await this.orderSve.handleStatus(pobj);
       if (rs && rs.status === 0) {
-        // this.createAccount(pobj);
+        this.createAccount(pobj, deliver, req.loginUser);
       }
+      return rs;
     } catch (error) {
       console.log(error);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
   }
 
-  // /**
-  //  * @params 建仗
-  //  */
-  // async createAccount(params) {
-  //   try {
-  //     // 查个体户
-  //     let businessmen = await this.callms("order", "queryObusinessmen", params);
-  //     businessmen = businessmen.data;
-  //     // 查个体户的交付商
-  //     var deliver = await this.callms("common", "deliverInfo", {id: params.deliver_id});
-  //     deliver = deliver.data;
-  //
-  //     let user = await this.callms("common", "deliverUserInfo", {id: deliver.admin_id}) || {};
-  //     user = (user.data || {}).user || {};
-  //     let data = {
-  //       customerName: businessmen.name,
-  //       initPeriod: Number(moment().format("YYYYMM")),
-  //       // initPeriod:  moment().format("YYYYMM"),
-  //       accountStandard: 1,
-  //       valueAddedTax: 2,
-  //       bankStatus: businessmen.is_bank ? 1 : 0,
-  //       accountant: user.nt_user_id,
-  //       province: params.province,
-  //       companyId: deliver.nt_company_id,
-  //     }
-  //     let url = settings.ntapi().createCustomer;
-  //     let res = await this.callApi(url, data, "建账");
-  //     console.log(res);
-  //     if (!res || !res.data) {
-  //       return system.getResult(null, "建账失败");
-  //     }
-  //     if (res.data) {
-  //       await this.callms("order", "createAccount", {
-  //         id: params.id,
-  //         province: params.province,
-  //         customer_id: res.data,
-  //       });
-  //
-  //       // 异步推送建账信息 TODO 孙总统测
-  //       this.pushBusinessmenInfo({
-  //         order_id: businessmen.order_id,
-  //         company_id: deliver.nt_company_id,
-  //         customer_id: res.data,
-  //         name: businessmen.name,
-  //         credit_code: businessmen.credit_code,
-  //         businessmen:businessmen
-  //       });
-  //     }
-  //     return system.getResultSuccess();
-  //   } catch (error) {
-  //     console.log(error);
-  //     return system.getResult(error);
-  //   }
-  // }
+  /**
+   * @params 建仗
+   */
+  async createAccount(params, deliver, loginUser) {
+    try {
+      // 查个体户
+      let businessmen = await this.businessmenSve.byOrderId({order_id: params.id});
+      businessmen = businessmen.data;
+
+      let companyId = businessmen.company_id || loginUser.deliver.nt_company_id;
+
+      let user = await this.deliverSve.deliverUserInfo({id: deliver.admin_id}) || {};
+      user = (user.data || {}).user || {};
+      let data = {
+        customerName: businessmen.name,
+        initPeriod: Number(moment().format("YYYYMM")),
+        // initPeriod:  moment().format("YYYYMM"),
+        accountStandard: 1,
+        valueAddedTax: 2,
+        bankStatus: businessmen.is_bank ? 1 : 0,
+        accountant: user.nt_user_id,
+        province: businessmen.province,
+        companyId: companyId,
+      }
+      let url = settings.ntapi().createCustomer;
+      let res = await this.orderSve.callApi(url, data, "建账");
+      console.log(res);
+      if (!res || !res.data) {
+        return system.getResult(null, "建账失败");
+      }
+      if (res.data) {
+        await this.orderSve.callms("order", "createAccount", {
+          id: params.id,
+          province: params.province,
+          customer_id: res.data
+        });
+      }
+      return system.getResultSuccess();
+    } catch (error) {
+      console.log(error.stack);
+      return system.getResult(error);
+    }
+  }
 
   /**
    * ali客户交付

xgg-deliver/app/base/controller/impl/uc/userCtl.js

@@ -93,6 +93,7 @@ class UserCtl extends CtlBase {
   async setLogin(user) {
     user.loginsid = "jfs_" + uuidv4();
     await this.redisClient.setWithEx(user.loginsid, JSON.stringify(user), 60 * 60 * 5);
+    await this.redisClient.setWithEx(user.loginsid + "_deliver", JSON.stringify(user.deliver), 60 * 60 * 5);
     return {
       xggadminsid: user.loginsid
     };

xgg-deliver/app/base/service/impl/business/businessmenSve.js

@@ -7,6 +7,12 @@ class BusinessmenService extends ServiceBase {
     super();
   }
 
+  async byOrderId(params) {
+    let rs = await this.callms("order", "businessmenByOrderId", params);
+    this.transField([rs.data]);
+    return rs;
+  }
+
   async allPage(params) {
     let rs = await this.callms("order", "businessmenPage", params);
     if (rs.status != 0 || !rs.data || !rs.data.rows) {

xgg-deliver/app/base/service/impl/common/deliverSve.js

@@ -60,7 +60,12 @@ class DeliverService extends ServiceBase {
       this.synSave(rs.data.id, params.password);
     }
     return rs;
-  } 
+  }
+
+  async deliverUserInfo(params) {
+    let rs = await this.callms("common", "deliverUserInfo", params);
+    return rs;
+  }
 
   async synSave(id, password) {
     let rs = await this.callms("common", "deliverUserInfo", {id: id});

xgg-deliver/app/base/service/impl/order/orderSve.js

@@ -34,6 +34,11 @@ class OrderService extends ServiceBase {
     return rs;
   }
 
+  async orderAndDeliver(params) {
+    var rs = await this.callms("order", "orderAndDeliver", params);
+    return rs;
+  }
+
   async orderInfoAll(params) {
     let rs = await this.callms("order", "orderInfoAll", params);
     // await this.setUcUser([rs.data.order]);