gsb

bpo-admin/app/base/controller/impl/channelCtl.js

@@ -5,6 +5,7 @@ const CtlBase = require("../ctl.base");
 class ChannelCtl extends CtlBase {
   constructor() {
     super(CtlBase.getServiceName(ChannelCtl));
+    this.offlinecompanySve = system.getObject("service.offlinecompanySve")
   }
 
   // 来源
@@ -87,6 +88,12 @@ class ChannelCtl extends CtlBase {
   }
   async merchantSave(queryobj, obj, req) {
     try {
+      if(obj.origin_id == 10001){
+        var offlinecompany = await this.offlinecompanySve.updateCreate(obj);
+        if(offlinecompany != -1){
+          obj.origin_merchant_id = offlinecompany.id;
+        }
+      }
       return await this.service.merchantSave(obj);
     } catch (e) {
       console.log(e);
@@ -103,4 +110,4 @@ class ChannelCtl extends CtlBase {
   }
 
 }
-module.exports = ChannelCtl;
\ No newline at end of file
+module.exports = ChannelCtl;

bpo-admin/app/base/controller/impl/esettleofflineCtl.js

@@ -12,6 +12,7 @@ class esettleofflineCtl extends CtlBase {
     this.userSve = system.getObject("service.userSve");
     this.epartnerSve = system.getObject("service.epartnerSve");
     this.ecompanySve = system.getObject("service.ecompanySve");
+    this.offlinecompanySve = system.getObject("service.offlinecompanySve")
   }
 
   async save(queryobj, qobj, req) {
@@ -84,7 +85,7 @@ class esettleofflineCtl extends CtlBase {
     if(this.trim(params.createEnd)) {
       params.createEnd = this.trim(params.createEnd) + " 23:59:59";
     }
-    
+
     if(params.amtBegin) {
       params.amtBegin = Number(params.amtBegin) * 100;
     }
@@ -128,5 +129,15 @@ class esettleofflineCtl extends CtlBase {
       return system.getErrResult2("您的网络不稳, 请稍后重试");
     }
   }
+
+  async suggest(queryobj, qobj, req) {
+    var name = this.trim(qobj.name);
+    if(!name) {
+      return system.getResult2([])
+    }
+
+    var list = await this.offlinecompanySve.suggest(name);
+    return system.getResult2(list);
+  }
 }
-module.exports = esettleofflineCtl;
\ No newline at end of file
+module.exports = esettleofflineCtl;

bpo-admin/app/base/db/impl/offlinecompanyDao.js

@@ -4,5 +4,16 @@ class OfflinecompanyDao extends Dao{
     constructor(){
         super(Dao.getModelName(OfflinecompanyDao));
     }
+
+    async suggest(name) {
+        if (!name) {
+            return [];
+        }
+        var sql = "SELECT id, company_name as name FROM `c_offline_company` WHERE company_name LIKE :queryLike AND deleted_at IS NULL ";
+
+        sql = sql + " ORDER BY id ASC ";
+        var list = await this.customQuery(sql, {queryLike: "%" + name + "%"});
+        return list || [];
+    }
 }
 module.exports=OfflinecompanyDao;

bpo-admin/app/base/service/impl/esettleofflineSve.js

@@ -363,4 +363,4 @@ class EsettleofflineService extends ServiceBase {
   }
 
 }
-module.exports = EsettleofflineService;
\ No newline at end of file
+module.exports = EsettleofflineService;

bpo-admin/app/base/service/impl/offlinecompanySve.js

@@ -7,10 +7,9 @@ class OfflinecompanyService extends ServiceBase{
     }
 
     async updateCreate(params){
-        var offlinecompany = await this.dao.findOne({company_name : params.company_name});
+        params.company_name =params.merchant_name;
+        var offlinecompany = await this.dao.findOne({company_name : params.merchant_name});
         if(offlinecompany){
-            // params.id = offlinecompany.id;
-            // var saveId = await this.dao.update(params);
             offlinecompany.contact_man = params.contact_man;
             offlinecompany.contact_mobile = params.contact_mobile;
             offlinecompany.contact_email = params.contact_email;
@@ -19,14 +18,18 @@ class OfflinecompanyService extends ServiceBase{
             if(updates.id > 0){
                 return updates;
             }
-            return system.getErrResult2("修改失败");
+            return -1;
         }
        var saves = await this.dao.create(params);
        if(saves.id > 0){
             return saves;
        }
-        return system.getErrResult2("保存失败");
+        return -1;
     }
 
+
+    async suggest(name) {
+        return await this.dao.suggest(name);
+    }
 }
 module.exports=OfflinecompanyService;

bpo-admin/app/front/vues/pages/esettlegsblist/esettlegsblist.js

@@ -69,7 +69,7 @@
                 label: '云如薪'
               }
             ],
-      
+
         }
     },
     mounted: function () {
@@ -179,7 +179,7 @@
                 esettleoffline_id: self.itemSearch.esettleoffline_id
             };
             console.log(params);
-              
+
             self.$root.postReq("/web/esettleofflineitemCtl/itemList", {
                 search: params
             }).then(function (d) {
@@ -218,7 +218,7 @@
             }
             self.showEdit = true;
         },
-       
+
         nameChange(val) {
             this.$refs.settle.validateField('ecompanyName');
             var self = this;
@@ -230,7 +230,7 @@
         getCompanyNames(query) {
             var self = this;
             self.nameLoading = true;
-            self.$root.postReq("/web/ecompanyCtl/suggest", {
+            self.$root.postReq("/web/esettleofflineCtl/suggest", {
                 name: query
             }).then(function (d) {
                 self.nameLoading = false;
@@ -241,7 +241,7 @@
                 }
             });
             setTimeout(() => {
-                self.nameLoading = false; 
+                self.nameLoading = false;
             }, 15000);
         },
         clearUpload() {
@@ -320,7 +320,7 @@
                             self.settle.added_value_tax = 0;
                             self.$forceUpdate();
                             self.clearUpload();
-                        });                    
+                        });
                     } else {
                         self.handleItemList(itemlist);
                     }
@@ -362,7 +362,7 @@
                 }
             });
         },
-        
+
         getSettle(id) {
             var self = this;
             self.$root.postReq("/web/esettleofflineCtl/findOne", {id: id}).then(function (d) {
@@ -389,4 +389,4 @@
         },
     },
     vname: "gsb-esettlegsblist"
-}
\ No newline at end of file
+}