dd

xggsve-order/app/base/db/impl/order/channelDao.js

+const system = require("../../../system");
+const Dao = require("../../dao.base");
+class ChannelDao extends Dao {
+  constructor() {
+    super(Dao.getModelName(ChannelDao));
+    this.statusMap = {};
+  }
+}
+module.exports = ChannelDao;
\ No newline at end of file

xggsve-order/app/base/db/models/business/businessmen.js

@@ -23,11 +23,15 @@ module.exports = (db, DataTypes) => {
     businessScope: DataTypes.STRING(500),
     regDate: DataTypes.DATE,
     businessImg: DataTypes.STRING(300),
+    gongshangFile: DataTypes.STRING(300),
+
     gongzhang: DataTypes.STRING(300),
     caiwuzhang: DataTypes.STRING(300),
     fapiaozhang: DataTypes.STRING(300),
     hetongzhang: DataTypes.STRING(300),
     farenzhang: DataTypes.STRING(300),
+    kezhangFile: DataTypes.STRING(300),
+
     isBank: {
       type: DataTypes.BOOLEAN,
       defaultValue: false
@@ -36,9 +40,13 @@ module.exports = (db, DataTypes) => {
     bankNo: DataTypes.STRING(30),
     bank: DataTypes.STRING(100),
     bankImg: DataTypes.STRING(300),
+    kaihuFile: DataTypes.STRING(300),
+
     caImg: DataTypes.STRING(300),
     taxRegDay: DataTypes.DATE,
     taxOrg: DataTypes.STRING(100),
+    shuiwuFile: DataTypes.STRING(100),
+
     courierNo: DataTypes.STRING(100),
     courierImg: DataTypes.STRING(100),
     contractStartData: DataTypes.DATE,

xggsve-order/app/base/db/models/order/iborder.js

@@ -55,6 +55,7 @@ module.exports = (db, DataTypes) => {
     deliverType: DataTypes.STRING,
     deliverNo: DataTypes.STRING,
     deliverImg: DataTypes.STRING,
+    productItems: DataTypes.STRING,
   }, {
     paranoid: true, //假的删除
     underscored: true,

xggsve-order/app/base/service/impl/order/channelSve.js

+const system = require("../../../system");
+const ServiceBase = require("../../sve.base")
+const settings = require("../../../../config/settings")
+const moment = require("moment");
+
+class ChannelService extends ServiceBase {
+  constructor() {
+    super("order", ServiceBase.getDaoName(ChannelService));
+  }
+}
+
+module.exports = ChannelService;
+// var task=new UserService();
+// task.getUserStatisticGroupByApp().then(function(result){
+//   console.log((result));
+// }).catch(function(e){
+//   console.log(e);
+// });
\ No newline at end of file

xggsve-order/app/base/service/impl/order/iborderSve.js

@@ -2,6 +2,7 @@ const system = require("../../../system");
 const ServiceBase = require("../../sve.base")
 const settings = require("../../../../config/settings")
 const moment = require("moment");
+
 class IborderService extends ServiceBase {
   constructor() {
     super("order", ServiceBase.getDaoName(IborderService));
@@ -120,6 +121,7 @@ class IborderService extends ServiceBase {
       return system.getResult(null, "接口异常");
     }
   }
+
   async apiCloseById(params) {
     try {
       return await this.closeById(params);
@@ -155,6 +157,7 @@ class IborderService extends ServiceBase {
       return system.getResult(null, "接口异常");
     }
   }
+
   async apiStatBusinessData(params) {
     try {
       return await this.statBusinessData(params);
@@ -165,14 +168,34 @@ class IborderService extends ServiceBase {
   }
 
 
-  // -----------------------以此间隔，上面为API，下面为service---------------------------------
+  // -----------------------以此间隔，上面为API下面为service---------------------------------
 
   async createOrder(params, t) {
-    // 处理注册订单
-    let productType = Number(params.productType || 1);
+    // 产品项
+    var order = {};
+    // 赋值
+    for (var k in params) {
+      order[k] = params[k];
+    }
+    order.productItems = (order.productItems || []).join(",");
+    order.status = "1010";
 
+    var busiStatus = await this.orderBusinessStatus.findOrderBusinessStatus(order.status);
+    if (busiStatus) {
+      order.ostatus = busiStatus.ostatus;
+    }
 
+    // 三方渠道号
+    order.channelOrderNo = this.trim(params.channelOrderNo);
+
+    // 订单资料信息
+    order.legalName = this.trim(params.legalName);
+    order.legalMobile = this.trim(params.legalMobile);
 
+    order = await this.dao.create(order, t);
+    return system.getResultSuccess({
+      orderNo: order.id
+    });
   }
 
   async statTransData(params) {
@@ -288,11 +311,11 @@ class IborderService extends ServiceBase {
 
   addStatCount(statusMap, statuses) {
     var count = 0;
-    if(!statuses) {
+    if (!statuses) {
       return count;
     }
 
-    for(var status of statuses) {
+    for (var status of statuses) {
       count = count + Number(statusMap[status] || 0);
     }
     return count;
@@ -779,6 +802,7 @@ class IborderService extends ServiceBase {
     return system.getResultSuccess();
   }
 }
+
 module.exports = IborderService;
 // var task=new UserService();
 // task.getUserStatisticGroupByApp().then(function(result){

xggsve-order/app/base/service/impl/order/iborderbaseSve.js

@@ -10,6 +10,8 @@ class IborderbaseService extends ServiceBase {
     this.iborderdkSve = system.getObject("service.order.iborderdkSve");
     this.iborderdzSve = system.getObject("service.order.iborderdzSve");
     this.businessmenSve = system.getObject("service.business.businessmenSve");
+    this.channelSve = system.getObject("service.order.channelSve");
+    this.paymentSve = system.getObject("service.order.paymentSve");
     this.services = {
       "1000": this.iborderSve,   // 注册订单
       "1010": this.iborderdzSve, // 代开订单
@@ -38,9 +40,9 @@ class IborderbaseService extends ServiceBase {
     // if(!params.channelNo){
     //   return system.getResult(null, `参数错误 渠道名称错误`);
     // }
-    // if(!params.thirdNo){
-    //   return system.getResult(null, `参数错误 订单错误`);
-    // }
+    if(!params.thirdNo){
+      return system.getResult(null, `请传入订单id`);
+    }
     // if(!Number(params.price)<0){
     //   return system.getResult(null, `参数错误 订单价格错误`);
     // }
@@ -64,6 +66,11 @@ class IborderbaseService extends ServiceBase {
     }
 
     try {
+      let channel = this.channelSve.findOne({channelNo: params.channelNo});
+      if (!channel) {
+        return system.getResult(null, `渠道${params.channelNo}不存在`);
+      }
+
       params.channelNo = this.trim(params.channelNo);
       params.thirdNo = this.trim(params.thirdNo);
       params.notes = this.trim(params.notes);
@@ -71,15 +78,34 @@ class IborderbaseService extends ServiceBase {
       params.legalMobile = this.trim(params.legalMobile);
       params.legalEmail = this.trim(params.legalEmail);
       params.payType = Number(params.payType || 1);
-      params.productType = Number(params.productType || 1);
+      params.productType = productType;
       params.price = Number(params.price || 0);
+      params.status = "1000"; // 待处理
+      params.channelOrderNo = params.channelNo;
+
       let self = this;
       //1 保存基类的信息
       await this.db.transaction(async t => {
         //创建基类表
         let _baseOrder = await self.create(params, t);
-        //将id 赋值
+
+        // 处理payment
+        if (payType != 2) {
+          var payment = {
+            order_id: _baseOrder.id,
+            price: params.price,
+            channelName: channel.channelName,
+            companyName: "",
+            payType: payType,
+            payStatus: "10",
+          };
+          payment = await this.paymentSve.create(payment);
+          params.orderpay_id = payment.id;
+        }
+        // 将id赋值
         params.id = _baseOrder.id;
+
+        // 创建订单
         await childSve.createOrder(params, t);
       });
       return system.getResultSuccess();
@@ -89,15 +115,15 @@ class IborderbaseService extends ServiceBase {
   }
 
   /**
- * 完善信息
- * @param {*} params
-  *   legalName 
-  *   legalMobile 
-  *   names 
-  *   creditCode 
-  *   isBank 
-  *   businessScope
-  */
+   * 完善信息
+   * @param {*} params
+   *   legalName
+   *   legalMobile
+   *   names
+   *   creditCode
+   *   isBank
+   *   businessScope
+   */
   async completedOrder(params) {
     try {
       //1 检查个体户是否存在 （根据统一社会信用代码查个体工商户是否存在）

xggsve-order/app/base/service/impl/order/iborderdeliverSve.js

@@ -358,6 +358,7 @@ class IborderdeliverService extends ServiceBase {
       updateFields.legalName = self.trim(order.legalName);
       updateFields.legalMobile = self.trim(order.legalMobile);
       updateFields.legalIdcard = self.trim(order.idcard);
+      updateFields.gongshangFile = self.trim(params.gongshangFile);
 
       if (businessmen.id) {
         updateFields.id = businessmen.id;
@@ -395,6 +396,7 @@ class IborderdeliverService extends ServiceBase {
       updateFields.fapiaozhang = self.trim(params.fapiaozhang);
       updateFields.hetongzhang = self.trim(params.hetongzhang);
       updateFields.farenzhang = self.trim(params.farenzhang);
+      updateFields.kezhangFile = self.trim(params.kezhangFile);
 
       await self.businessmenDao.update(updateFields, t);
       await self.updateOrderStatusTranscation(dorder, params.nextObj, t);
@@ -422,6 +424,8 @@ class IborderdeliverService extends ServiceBase {
       updateFields.bank = self.trim(params.bank);
       updateFields.bankImg = self.trim(params.bankImg);
 
+      updateFields.kaihuFile = self.trim(params.kaihuFile);
+
       await self.businessmenDao.update(updateFields, t);
       await self.updateOrderStatusTranscation(dorder, params.nextObj, t);
       return 1;
@@ -446,6 +450,7 @@ class IborderdeliverService extends ServiceBase {
       updateFields.caImg = params.caImg;
       updateFields.taxRegDay = params.taxRegDay;
       updateFields.taxOrg = params.taxOrg;
+      updateFields.shuiwuFile = self.trim(params.shuiwuFile);
 
       await self.businessmenDao.update(updateFields, t);
       await self.updateOrderStatusTranscation(dorder, params.nextObj, t);