Merge branch 'gsb-marketplat' of gitlab.gongsibao.com:jiangyong/zhichan into gsb-marketplat

gsb-marketplat/app/base/api/impl/action/mediaaggregation.js

@@ -83,68 +83,11 @@ class Mediaaggregation extends APIBase {
             case "clueMaintenance"://二类产品资质选项(选取数据线索的数据)
                 opResult = await this.mediaaggregationSve.clueMaintenance(pobj);
                 break;
-            case "productListAll"://所有产品及分类
-                opResult = await this.mediaaggregationSve.productListAll(pobj);
-                break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 break;
         }
         return opResult;
     }
-
-
-    /**
-      * 接口跳转-POST请求
-      * action_process  执行的流程
-      * action_type     执行的类型
-      * action_body     执行的参数
-      */
-    // async mediAaggregationApi(pobj, qobj, req) {
-    //     if (!pobj.actionType) {
-    //         return system.getResult(null, "actionType参数不能为空");
-    //     }
-    //     var result = await this.mediAaggregationAction(pobj, pobj.actionType, req);
-    //     return result;
-    // }
-
-    // async mediAaggregationAction(pobj, action_type, req) {
-    //     var opResult = null;
-    //     var self = this;
-    //     pobj.xctx = req.xctx;
-    //     switch (action_type) {
-    //         case "test"://测试
-    //             opResult = system.getResultSuccess("测试接口");
-    //             break;
-    //         case "productList"://服务列表
-    //             opResult = await this.mediaaggregationSve.productList(pobj);
-    //             break;
-    //         case "rotationChartList"://首页轮播图
-    //             opResult = await this.mediaaggregationSve.rotationChartList(pobj);
-    //             break;
-    //         case "needProductList"://留资表单产品
-    //             opResult = await this.mediaaggregationSve.needProductList(pobj);
-    //             break;
-    //         case "popularRecommendationList"://热门推荐列表
-    //             opResult = await this.mediaaggregationSve.popularRecommendationList(pobj);
-    //             break;
-    //         case "productTypeFirst"://产品分类列表
-    //             opResult = await this.mediaaggregationSve.productTypeFirst(pobj);
-    //             break;
-    //         case "productTypeSecend"://产品分类列表
-    //             opResult = await this.mediaaggregationSve.productTypeSecend(pobj);
-    //             break;
-    //         case "productDetail"://产品详情页
-    //             opResult = await this.mediaaggregationSve.productDetail(pobj);
-    //             break;
-    //         case "bottomMenuConfig"://吸底菜单
-    //             opResult = await this.mediaaggregationSve.bottomMenuConfig(pobj);
-    //             break;
-    //         default:
-    //             opResult = system.getResult(null, "action_type参数错误");
-    //     }
-    //     return opResult;
-    // }
-
 }
 module.exports = Mediaaggregation;

gsb-marketplat/app/base/db/impl/mediaaggregation/mediaaggregationDao.js

@@ -254,30 +254,6 @@ class MediaaggregationDao extends Dao {
     returnRes.total = tmpResultCount && tmpResultCount.length > 0 ? tmpResultCount[0].dataCount : 0;
     return returnRes;
   }
-  
-  
-  /**
-   * 所有产品分类及产品
-   */
-  async productListAll(req) {
-    var params = {
-      // company_id: req.actionBody.company_id,
-      company_id: 10
-      
-    };
-    var returnRes = {
-      total: 0,//总记录条数
-      rows: []
-    };
-    
-
-    var list = await this.customQuery(productTypeSql, params);
-    var tmpResultCount = await this.customQuery(productTypeCount, params);
-    
-    returnRes.rows = list;
-    returnRes.total = tmpResultCount && tmpResultCount.length > 0 ? tmpResultCount[0].productTypeCount : 0;
-    return returnRes;
-  }
-  
+ 
 }
 module.exports = MediaaggregationDao;
\ No newline at end of file

gsb-marketplat/app/base/service/impl/mediaaggregation/mediaaggregationSve.js

@@ -126,17 +126,6 @@ class MediaaggregationSve {
         return system.getResultSuccess(res);
     }
     
-    
-    //二级产品资质选项
-    async productListAll(pobj) {
-        if (!pobj || !pobj.actionBody || !pobj.actionBody.company_id) {
-            return system.getResultFail(-100, "参数错误");
-        }
-
-        var res = await mediaaggregationDao.productListAll(pobj);
-        return system.getResultSuccess(res);
-    }
-
 }