【供应商资源】供应商列表接口搜索调整2

src/main/java/com/uas/platform/b2c/common/account/model/Enterprise.java

@@ -177,18 +177,6 @@ public class Enterprise implements Serializable {
 	@Column(name = "en_validcode")
 	private Short enValidCode;
 
-	/**
-	 * 行业
-	 */
-	@Column(name = "en_profession")
-	private String profession;
-
-	/**
-	 * 经营范围
-	 */
-	@Column(name = "en_tags")
-	private String tags;
-
 	/**
 	 * 企业经营范围;
 	 */
@@ -469,22 +457,6 @@ public class Enterprise implements Serializable {
 		this.enBussinessCodeImage = enBussinessCodeImage;
 	}
 
-	public String getProfession() {
-		return profession;
-	}
-
-	public void setProfession(String profession) {
-		this.profession = profession;
-	}
-
-	public String getTags() {
-		return tags;
-	}
-
-	public void setTags(String tags) {
-		this.tags = tags;
-	}
-
 	/**
 	 * saas用户
 	 * 

src/main/java/com/uas/platform/b2c/prod/commodity/model/V_ProductPrivate.java

@@ -224,6 +224,8 @@ public class V_ProductPrivate implements Serializable {
      * b2c是否启用
      * 1 启用，
      * 0 未启用
+     * @date 2018年5月8日 17:16:07 dongbw 由于公共物料服务所有物料更新方法都顾及到b2c私有可用属性不好实现，返回去修改商城物料逻辑也很复杂
+     *       现在修改视图为b2cenabled字段为0是为0，非0时为1.
      */
     @Column(name = "pr_b2cenabled")
     private Integer b2cEnabled;

src/main/java/com/uas/platform/b2c/trade/vendor/model/VendorIntroduction.java

@@ -50,12 +50,12 @@ public class VendorIntroduction {
     /**
      * 行业
      */
-    private String enProfession;
+    private String enIndustry;
 
     /**
      * 主营业务
      */
-    private String enTags;
+    private String enBusinessScope;
 
     /**
      * 联系人
@@ -154,20 +154,20 @@ public class VendorIntroduction {
         this.enBusinesscode = enBusinesscode;
     }
 
-    public String getEnProfession() {
-        return enProfession;
+    public String getEnIndustry() {
+        return enIndustry;
     }
 
-    public void setEnProfession(String enProfession) {
-        this.enProfession = enProfession;
+    public void setEnIndustry(String enIndustry) {
+        this.enIndustry = enIndustry;
     }
 
-    public String getEnTags() {
-        return enTags;
+    public String getEnBusinessScope() {
+        return enBusinessScope;
     }
 
-    public void setEnTags(String enTags) {
-        this.enTags = enTags;
+    public void setEnBusinessScope(String enBusinessScope) {
+        this.enBusinessScope = enBusinessScope;
     }
 
     public String getEnContactman() {

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/VendorIntroductionServiceImpl.java

@@ -103,7 +103,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		String enUUSql = getEnUUGroupByEnUUOrderByCount(enUU, keyword);
 		// 获取企业sql
 		enterpriseSql.append("select en.en_uu enUU, en.en_name enName, en.en_shortname enShortname, en.en_address enAddress, en.en_tel enTel, " +
-				"en.en_email enEmail, en.en_corporation enCorporation, en.en_businesscode enBusinesscode, en.en_profession enProfession, en.en_tags enTags " +
+				"en.en_email enEmail, en.en_corporation enCorporation, en.en_businesscode enBusinesscode, en.en_industry enIndustry, en.en_Businessscope enBusinessScope " +
 				" from sec$enterprises en right join (").append(enUUSql)
 				.append(" ) a on en.en_uu = a.en_uu order by en.en_weight desc, counts desc");
 		// rownum 控制
@@ -149,7 +149,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 	 */
 	private String getKeywordSql(Long enUU, String keyword) {
 		return "select en_uu,count(1) as counts from sec$enterprises left join products on pr_enuu = en_uu where en_name not like '%测试%' and lower(en_name) not like '%test%' and (en_name like '%"
-				+ keyword + "%' or en_address like '%" + keyword + "%' or en_tags like '%" + keyword + "%' or en_profession like '%" + keyword
+				+ keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '%" + keyword
 				+ "%' or pr_cmpcode like '%" + keyword + "%' or pr_brand like '%" + keyword
 				+ "%') and en_uu <> " + enUU;
 	}