fix: 代码规范

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -590,7 +590,10 @@ class DeliverybillCtl extends CtlBase {
             };
             };
           }
           }
           await this.shisService.insertInfo(sInfo);// 之前业务员转历史
           await this.shisService.insertInfo(sInfo);// 之前业务员转历史
-          await this.service.updateSalesmanInfoByDeliverCode({ ...pobj, masterSourceNumber: res.master_source_number });// 更新业务员信息
+          await this.service.updateSalesmanInfoByDeliverCode({
+            ...pobj,
+            masterSourceNumber: res.master_source_number
+          });// 更新业务员信息
           return system.getResult('操作成功！');
           return system.getResult('操作成功！');
         }
         }
 
 
@@ -602,10 +605,8 @@ class DeliverybillCtl extends CtlBase {
       return system.getResultError('参数错误!');
       return system.getResultError('参数错误!');
     }
     }
   }
   }
-
   /** 查询子订单的关联单 */
   /** 查询子订单的关联单 */
   async findRelationOrder(mobj) {
   async findRelationOrder(mobj) {
-
     try {
     try {
       if (!mobj.deliverNumber) {
       if (!mobj.deliverNumber) {
         throw new Error("deliverNumber 不能为空");
         throw new Error("deliverNumber 不能为空");
@@ -634,7 +635,6 @@ class DeliverybillCtl extends CtlBase {
     } catch (error) {
     } catch (error) {
       return system.getResultError(error.message);
       return system.getResultError(error.message);
     }
     }
-
   }
   }
   /* 更新业务员信息*/
   /* 更新业务员信息*/
   async updateSalesmanInfoByDeliverCode(mobj, qobj, req) {
   async updateSalesmanInfoByDeliverCode(mobj, qobj, req) {

ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js

@@ -182,9 +182,18 @@ class DeliverybillDao extends Dao {
     if (qobj.servicerName && qobj.servicerName != 'undefined') {
     if (qobj.servicerName && qobj.servicerName != 'undefined') {
       obj.facilitator_name = qobj.servicerName;
       obj.facilitator_name = qobj.servicerName;
     }
     }
+
     if (qobj.clerkName && qobj.clerkName != 'undefined') {
     if (qobj.clerkName && qobj.clerkName != 'undefined') {
-      obj.delivery_man_name = qobj.clerkName;
+      obj.salesman_name = qobj.clerkName;
+    }
+    if (qobj.clerkOpcode && qobj.clerkOpcode != 'undefined') {
+      obj.salesman_opcode = qobj.clerkOpcode;
     }
     }
+    if (qobj.clerkId && qobj.clerkId != 'undefined') {
+      obj.salesman_id = qobj.clerkId;
+    }
+
+
     if (qobj.salesmanName && qobj.salesmanName != undefined) {
     if (qobj.salesmanName && qobj.salesmanName != undefined) {
       obj.salesman_name = qobj.salesmanName;
       obj.salesman_name = qobj.salesmanName;
     }
     }
@@ -194,15 +203,10 @@ class DeliverybillDao extends Dao {
     if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
     if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
       obj.salesman_opcode = qobj.salesmanOpcode;
       obj.salesman_opcode = qobj.salesmanOpcode;
     }
     }
-    if (qobj.clerkOpcode && qobj.clerkOpcode != 'undefined') {
-      obj.delivery_man_opcode = qobj.clerkOpcode;
-    }
     if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
     if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
       obj.salesman_id = qobj.salesmanId;
       obj.salesman_id = qobj.salesmanId;
     }
     }
-    if (qobj.clerkId && qobj.clerkId != 'undefined') {
-      obj.delivery_man_id = qobj.clerkId;
-    }
+
     if (qobj.sellingPrice && qobj.sellingPrice != 'undefined') {
     if (qobj.sellingPrice && qobj.sellingPrice != 'undefined') {
       obj.selling_price = qobj.sellingPrice;
       obj.selling_price = qobj.sellingPrice;
     }
     }