Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/service/impl/trademark/toolSve.js

@@ -69,8 +69,16 @@ class ToolService extends AppServiceBase {
   }
   }
   //工商核名
   //工商核名
   async icheming(queryobj, req) {
   async icheming(queryobj, req) {
-    var url = this.zcApiUrl + "api/trademark/tmqueryApi/icheming";
-    return await this.opReqResult(url, queryobj, req);
+    let url = settings.icNameUrl() + 'openPlatform/ic/match';
+    let obj = {
+      cityname: queryobj.cityName, //注册城市地区
+      keyword: queryobj.keyWord, //公司字号
+      btname: queryobj.industryType, //行业类型
+      orgname: queryobj.organizationType, //组织类型
+      appkey: "5b29981785bd4272966b15ad8e8b9dd3"
+    };
+    let result = await this.restPostUrl(obj, url);
+    return system.getResultSuccess(result);
   }
   }
   //尼斯过滤
   //尼斯过滤
   async getTmNclFilterSearch(queryobj, req) {
   async getTmNclFilterSearch(queryobj, req) {

center-channel/app/base/service/impl/utilsSve/utilsFqAliyunSve.js

@@ -47,6 +47,7 @@ class UtilsFqAliyunService extends AppServiceBase {
       phone: orderContact.mobile,// 是 手机号
       phone: orderContact.mobile,// 是 手机号
       userId: orderInfo.channelUserId,// 否 用户 ID
       userId: orderInfo.channelUserId,// 否 用户 ID
       companyName: "",// 否 公司名称
       companyName: "",// 否 公司名称
+      orderNo:orderInfo.orderNo,
       orderPrice: orderInfo.totalSum,// 是 订单金额
       orderPrice: orderInfo.totalSum,// 是 订单金额
       productId: productInfo.price_item.service_code,// 是 产品 ID
       productId: productInfo.price_item.service_code,// 是 产品 ID
       productQuantity: orderInfo.quantity,// 是 产品数量
       productQuantity: orderInfo.quantity,// 是 产品数量

center-channel/app/base/utils/dingClient.js

@@ -21,7 +21,7 @@ class dingClient {
   //渠道钉钉提醒
   //渠道钉钉提醒
   async gatewayPushByChannel(orderNo,appInfo){
   async gatewayPushByChannel(orderNo,appInfo){
     let gatewayUrl = setttings.dingRobotUrl(appInfo.uapp_id);
     let gatewayUrl = setttings.dingRobotUrl(appInfo.uapp_id);
-    if (process.env.APP_ENV === "prod" && gatewayUrl) {
+    if (process.env.APP_ENV != "dev" && gatewayUrl) {
       let c = `注意提醒：${appInfo.app_name}->有订单待处理，订单号${orderNo}，老板们加油，加油，加油 ！！！`
       let c = `注意提醒：${appInfo.app_name}->有订单待处理，订单号${orderNo}，老板们加油，加油，加油 ！！！`
       let t = new Date().toLocaleString()
       let t = new Date().toLocaleString()
       this.execClient.execPost({
       this.execClient.execPost({