From 4eb1d1d71a1e83ae5a9560fbd86e7e24fc112477 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 23 May 2020 21:09:58 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#1571=20=E5=AF=B9=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=B6=88=E6=81=AF=E8=A1=8C=E4=B8=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E5=8F=98=E6=80=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B0=BD=E5=8F=AF=E8=83=BD=E7=9A=84=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/WxMpTemplateIndustryEnum.java    | 14 +++++------
 .../mp/util/json/WxMpIndustryGsonAdapter.java |  5 ++++
 .../impl/WxMpTemplateMsgServiceImplTest.java  |  4 +--
 .../template/WxMpTemplateIndustryTest.java    | 25 +++++++++++++------
 4 files changed, 31 insertions(+), 17 deletions(-)

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
index b3bfcba1b..022551d64 100644
--- 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
@@ -41,9 +41,9 @@ public enum WxMpTemplateIndustryEnum {
    */
   BANK("金融业", "银行", 7),
   /**
-   * 金融业 - 基金|理财|信托
+   * 金融业 - 证券|基金|理财|信托（实际是这个）
    */
-  FUND("金融业", "基金|理财|信托", 8),
+  FUND("金融业", "证券基金理财信托", 8),
   /**
    * 金融业 - 保险
    */
@@ -93,9 +93,9 @@ public enum WxMpTemplateIndustryEnum {
    */
   MUSEUM("政府与公共事业", "博物馆", 20),
   /**
-   * 政府与公共事业 - 公共事业|非盈利机构
+   * 政府与公共事业 - 公共事业非盈利机构
    */
-  PUBLIC_WORKS_NONPROFIT("政府与公共事业", "公共事业|非盈利机构", 21),
+  PUBLIC_WORKS_NONPROFIT("政府与公共事业", "公共事业非盈利机构", 21),
   /**
    * 医药护理 - 医药医疗
    */
@@ -125,7 +125,7 @@ public enum WxMpTemplateIndustryEnum {
    */
   THE_PLANE_RELATED("交通工具", "飞机相关", 28),
   /**
-   * 房地产 - 建筑
+   * 房地产 - 房地产|建筑（实际上是这个）
    */
   ARCHITECTURE("房地产", "建筑", 29),
   /**
@@ -153,9 +153,9 @@ public enum WxMpTemplateIndustryEnum {
    */
   AUTHENTICATION("商业服务", "认证", 35),
   /**
-   * 商业服务 - 会计|审计
+   * 商业服务 - 审计
    */
-  AUDIT("商业服务", "会计|审计", 36),
+  AUDIT("商业服务", "审计", 36),
   /**
    * 文体娱乐 - 传媒
    */
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
index 04d9d7dad..9c418c2a6 100644
--- 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
@@ -29,6 +29,11 @@ public class WxMpIndustryGsonAdapter implements JsonSerializer<WxMpTemplateIndus
 
   private WxMpTemplateIndustryEnum convertFromJson(JsonObject json) {
     String secondClass = GsonHelper.getString(json, "second_class");
+    final WxMpTemplateIndustryEnum industryEnum = WxMpTemplateIndustryEnum.findBySecondary(secondClass);
+    if (industryEnum != null) {
+      return industryEnum;
+    }
+
     if (secondClass.contains("|")) {
       secondClass = secondClass.split("\\|")[1];
     }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpTemplateMsgServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpTemplateMsgServiceImplTest.java
index 181411df4..884e41b59 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpTemplateMsgServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpTemplateMsgServiceImplTest.java
@@ -53,8 +53,8 @@ public class WxMpTemplateMsgServiceImplTest {
 
   @Test
   public void testSetIndustry() throws Exception {
-    WxMpTemplateIndustry industry = new WxMpTemplateIndustry(WxMpTemplateIndustryEnum.findByCode(1),
-      WxMpTemplateIndustryEnum.findByCode(4));
+    WxMpTemplateIndustry industry = new WxMpTemplateIndustry(WxMpTemplateIndustryEnum.findByCode(29),
+      WxMpTemplateIndustryEnum.findByCode(8));
     boolean result = this.wxService.getTemplateMsgService().setIndustry(industry);
     Assert.assertTrue(result);
   }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
index eddcfd31b..c2ae72297 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
@@ -3,7 +3,6 @@ package me.chanjar.weixin.mp.bean.template;
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.*;
 
 /**
  * 测试类.
@@ -13,11 +12,21 @@ import static org.testng.Assert.*;
  */
 public class WxMpTemplateIndustryTest {
 
-    @Test
-    public void testFromJson() {
-      String json="{\"primary_industry\":{\"first_class\":\"IT科技\",\"second_class\":\"互联网|电子商务\"},\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"房地产|建筑\"}}";
-      final WxMpTemplateIndustry industry = WxMpTemplateIndustry.fromJson(json);
-      assertThat(industry).isNotNull();
-      System.out.println(industry);
-    }
+  @Test
+  public void testFromJson() {
+    String json = "{\"primary_industry\":{\"first_class\":\"IT科技\",\"second_class\":\"互联网|电子商务\"}," +
+      "\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"房地产|建筑\"}}";
+    final WxMpTemplateIndustry industry = WxMpTemplateIndustry.fromJson(json);
+    assertThat(industry).isNotNull();
+    System.out.println(industry);
+  }
+
+  @Test
+  public void testFromJson_another_example() {
+    String json = "{\"primary_industry\":{\"first_class\":\"金融业\",\"second_class\":\"基金理财信托\"}," +
+      "\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"建筑\"}}";
+    final WxMpTemplateIndustry industry = WxMpTemplateIndustry.fromJson(json);
+    assertThat(industry).isNotNull();
+    System.out.println(industry);
+  }
 }