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

center-app/app/base/service/impl/dbproduct/productSve.js

@@ -73,7 +73,7 @@ class ProductService extends ServiceBase {
     var producesql = "";
     if (actionBody.regType == "ali.companyreg") {
       var area = actionBody.area || "";
-      producesql = "SELECT pc.pay_code payCode,pt.channel_item_code channelItemCode FROM `p_product` pt JOIN p_product_price pc ON pt.id = pc.product_id WHERE pt.channel_item_name LIKE '%" + actionBody.city
+      producesql = "SELECT pc.pay_code payCode,pt.channel_item_code channelItemCode,pc.service_code FROM `p_product` pt JOIN p_product_price pc ON pt.id = pc.product_id WHERE pt.channel_item_name LIKE '%" + actionBody.city
         + "%' AND pc.price_desc LIKE '%" + area
         + "%' and pc.additions_desc LIKE '%" + actionBody.companyCategory + "%' ;"
     } else {
@@ -90,7 +90,7 @@ class ProductService extends ServiceBase {
 
   async getaliicpProduce(actionBody,appInfo) {
     // var uapp_id = appInfo && appInfo.uapp_id?appInfo.uapp_id:"";
-    var producesql = "SELECT pc.pay_code payCode,pt.channel_item_code channelItemCode,pc.price price FROM `p_product` pt JOIN p_product_price pc ON pt.id = pc.product_id WHERE pt.channel_item_code LIKE '%" + actionBody.typeCode
+    var producesql = "SELECT pc.pay_code payCode,pt.channel_item_code channelItemCode,pc.price price,pc.service_code FROM `p_product` pt JOIN p_product_price pc ON pt.id = pc.product_id WHERE pt.channel_item_code LIKE '%" + actionBody.typeCode
       + "%' AND pc.price_desc='"+actionBody.province+"' ";
     // if(uapp_id){
     //   producesql = producesql+" and  uapp_id="+uapp_id;
@@ -133,7 +133,7 @@ class ProductService extends ServiceBase {
     const code1 = pathCode.split('/')[1];//一级产品码
     const code2 = pathCode.split('/')[2];//二级产品码
     let channel_item_code = code2;
-    var producesql = `SELECT pc.pay_code payCode,pt.channel_item_code channelItemCode,pc.price price FROM p_product pt JOIN p_product_price pc ON pt.id = pc.product_id WHERE is_show = 1 AND pt.channel_item_code = '${channelItemCode}'`;
+    var producesql = `SELECT pc.pay_code payCode,pt.channel_item_code channelItemCode,pc.price price,pc.service_code FROM p_product pt JOIN p_product_price pc ON pt.id = pc.product_id WHERE is_show = 1 AND pt.channel_item_code = '${channelItemCode}'`;
     switch (code1) {
       case 'sbfu':
         channel_item_code = channelItemCode;