Merge branch 'xggsve-order-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-order-dev

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

@@ -89,12 +89,24 @@ class IborderbaseService extends ServiceBase {
   }
   }
 
 
   /**
   /**
-   * 完善信息
-   * @param {*} params
-   */
+ * 完善信息
+ * @param {*} params
+  *   legalName 
+  *   legalMobile 
+  *   names 
+  *   creditCode 
+  *   isBank 
+  *   businessScope
+  */
   async completedOrder(params) {
   async completedOrder(params) {
-    //1 检查个体户是否存在
-
+    //1 检查个体户是否存在 （根据统一社会信用代码查个体工商户是否存在）
+    this.trimObject(params);
+    if(!params.legalName){return system.getResult(null,`参数错误 法人姓名不能为空`);}
+    if(!params.legalMobile){return system.getResult(null,`参数错误 法人电话不能为空`);}
+    if(!params.creditCode){return system.getResult(null,`参数错误 法人统一社会信用代码不能为空`);}
+    if(!params.names){return system.getResult(null,`参数错误 个体户名称不能为空`);}
+    if(!params.businessScope){return system.getResult(null,`参数错误 经营范围不能为空`);}
+    
     //2 如果不存在添加保存个体户  
     //2 如果不存在添加保存个体户  
     //3 完善信息
     //3 完善信息
   }
   }

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

@@ -31,13 +31,8 @@ class IborderdkService extends ServiceBase {
       if (!Number(params.price) < 0) {
       if (!Number(params.price) < 0) {
         return system.getResult(null, `参数错误 订单金额格式错误`);
         return system.getResult(null, `参数错误 订单金额格式错误`);
       }
       }
-      for (let key in params) {
-        if (params[key] instanceof String) {
-          params[key] = this.trim(params[key]);
-        }
-      }
-      let _ibOrderDk = null;
-      _ibOrderDk = await this.dao.create(params, t);
+      this.trimObject(params);
+      let _ibOrderDk = await this.dao.create(params, t);
       return system.getResult(_ibOrderDk);
       return system.getResult(_ibOrderDk);
     } catch (error) {
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
@@ -46,9 +41,3 @@ class IborderdkService extends ServiceBase {
 }
 }
 
 
 module.exports = IborderdkService;
 module.exports = IborderdkService;
-// var task=new UserService();
-// task.getUserStatisticGroupByApp().then(function(result){
-//   console.log((result));
-// }).catch(function(e){
-//   console.log(e);
-// });
\ No newline at end of file