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

center-app/app/base/api/impl/action/opProduct.js

@@ -68,6 +68,12 @@ class OpProductAPI extends APIBase {
       case "getAllProducts":
       case "getAllProducts":
         opResult = await this.productSve.getAllProducts();
         opResult = await this.productSve.getAllProducts();
         break;
         break;
+      case "getProducts":
+        opResult = await this.productSve.getProducts(pobj);
+        break;
+      case "getProductsPrice":
+        opResult = await this.productSve.getProductsPrice(pobj);
+        break;
       case "getProductByWhere":
       case "getProductByWhere":
         opResult = await this.productSve.getProductByWhere(pobj.actionBody);
         opResult = await this.productSve.getProductByWhere(pobj.actionBody);
         break;
         break;

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

@@ -522,6 +522,35 @@ class ProductService extends ServiceBase {
   }
   }
 
 
   /**
   /**
+   * 根据条件获取产品
+   * @param actionBody
+   * @returns {Promise<void>}
+   */
+  async getProducts(pobj){
+    let actionBody = pobj.actionBody;
+    var sql = "select * from v_product where uapp_id=" + pobj.appInfo.uapp_id;
+    if(actionBody.pathCode) {
+      sql += " and path_code like '" + actionBody.pathCode+ "%'"
+    }
+    if(actionBody.productName){
+      sql += " and item_name like '" + actionBody.productName + "%'"
+    }
+    var list = await this.customQuery(sql);
+    return system.getResultSuccess(list);
+  }
+
+  /**
+   * 目前用作创建方案时获取当前app的商品的属性（product_price-price_desc）
+   * @param actionBody
+   * @returns {Promise<void>}
+   */
+  async getProductsPrice(pobj){
+    var sql = "select * from p_product_price where product_id=" + pobj.actionBody.product_id;
+    var list = await this.customQuery(sql);
+    return system.getResultSuccess(list);
+  }
+
+  /**
    * 根据条件过去产品
    * 根据条件过去产品
    * @param actionBody
    * @param actionBody
    * @returns {Promise<void>}
    * @returns {Promise<void>}