laolan

center-channel/app/base/service/impl/common/baseCenterOrderSve.js

@@ -480,7 +480,6 @@ class BaseCenterOrderService extends AppServiceBase {
             //推送数据至百度 
             //推送数据至百度 
             var BizId = needsolution.orderChannelNo;
             var BizId = needsolution.orderChannelNo;
             console.log('BizId++',BizId)
             console.log('BizId++',BizId)
-            console.log('productType++',res.data.productType)
             reqPushParams = {
             reqPushParams = {
               actionBody: {
               actionBody: {
                 "uapp_id":res.data.uapp_id,
                 "uapp_id":res.data.uapp_id,

center-channel/app/config/localsettings.js

@@ -3,11 +3,7 @@ var settings = {
     host: "39.107.234.14",
     host: "39.107.234.14",
     port: 6379,
     port: 6379,
     password: "123123",
     password: "123123",
-<<<<<<< HEAD
-    db: 4,
-=======
     db: 5,
     db: 5,
->>>>>>> ee22c06d663d0b78a7cdead69c8849172aa9fa5a
   },
   },
   database: {
   database: {
     dbname: "igirl_api",
     dbname: "igirl_api",