🎨 微信模版消息行业获取的代码优化

binarywang · binarywang · commit 17aaba249645 · 2020-05-30T21:59:32.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java
@@ -193,12 +193,13 @@ public enum WxMpTemplateIndustryEnum {
   /**
    * 查找行业
    *
-   * @param industry 二级行业名称
+   * @param firstClass  主行业名称
+   * @param secondClass 副行业名称
    * @return .
    */
-  public static WxMpTemplateIndustryEnum findBySecondary(String industry) {
+  public static WxMpTemplateIndustryEnum findByClass(String firstClass, String secondClass) {
     for (WxMpTemplateIndustryEnum industryEnum : WxMpTemplateIndustryEnum.values()) {
-      if (industryEnum.secondClass.contains(industry)) {
+      if (industryEnum.firstClass.equals(firstClass) && industryEnum.secondClass.contains(secondClass)) {
         return industryEnum;
       }
     }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java
@@ -28,8 +28,9 @@ public WxMpTemplateIndustry deserialize(JsonElement jsonElement, Type type, Json
   }
 
   private WxMpTemplateIndustryEnum convertFromJson(JsonObject json) {
+    String firstClass = GsonHelper.getString(json, "first_class");
     String secondClass = GsonHelper.getString(json, "second_class");
-    final WxMpTemplateIndustryEnum industryEnum = WxMpTemplateIndustryEnum.findBySecondary(secondClass);
+    final WxMpTemplateIndustryEnum industryEnum = WxMpTemplateIndustryEnum.findByClass(firstClass, secondClass);
     if (industryEnum != null) {
       return industryEnum;
     }
@@ -38,7 +39,7 @@ private WxMpTemplateIndustryEnum convertFromJson(JsonObject json) {
       secondClass = secondClass.split("\\|")[1];
     }
 
-    return WxMpTemplateIndustryEnum.findBySecondary(secondClass);
+    return WxMpTemplateIndustryEnum.findByClass(firstClass, secondClass);
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -193,12 +193,13 @@ public enum WxMpTemplateIndustryEnum {`
`193`	`193`	`/**`
`194`	`194`	`* 查找行业`
`195`	`195`	`*`
`196`		`- * @param industry 二级行业名称`
	`196`	`+ * @param firstClass 主行业名称`
	`197`	`+ * @param secondClass 副行业名称`
`197`	`198`	`* @return .`
`198`	`199`	`*/`
`199`		`- public static WxMpTemplateIndustryEnum findBySecondary(String industry) {`
	`200`	`+ public static WxMpTemplateIndustryEnum findByClass(String firstClass, String secondClass) {`
`200`	`201`	`for (WxMpTemplateIndustryEnum industryEnum : WxMpTemplateIndustryEnum.values()) {`
`201`		`- if (industryEnum.secondClass.contains(industry)) {`
	`202`	`+ if (industryEnum.firstClass.equals(firstClass) && industryEnum.secondClass.contains(secondClass)) {`
`202`	`203`	`return industryEnum;`
`203`	`204`	`}`
`204`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,9 @@ public WxMpTemplateIndustry deserialize(JsonElement jsonElement, Type type, Json`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`private WxMpTemplateIndustryEnum convertFromJson(JsonObject json) {`
	`31`	`+ String firstClass = GsonHelper.getString(json, "first_class");`
`31`	`32`	`String secondClass = GsonHelper.getString(json, "second_class");`
`32`		`- final WxMpTemplateIndustryEnum industryEnum = WxMpTemplateIndustryEnum.findBySecondary(secondClass);`
	`33`	`+ final WxMpTemplateIndustryEnum industryEnum = WxMpTemplateIndustryEnum.findByClass(firstClass, secondClass);`
`33`	`34`	`if (industryEnum != null) {`
`34`	`35`	`return industryEnum;`
`35`	`36`	`}`
`@@ -38,7 +39,7 @@ private WxMpTemplateIndustryEnum convertFromJson(JsonObject json) {`
`38`	`39`	`secondClass = secondClass.split("\\\|")[1];`
`39`	`40`	`}`
`40`	`41`
`41`		`- return WxMpTemplateIndustryEnum.findBySecondary(secondClass);`
	`42`	`+ return WxMpTemplateIndustryEnum.findByClass(firstClass, secondClass);`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`}`