From 4b13a040140cc16efc71345cd50de7ee28ebe05a Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 29 Feb 2020 15:22:53 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20#1413=20=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96=E8=A1=8C=E4=B8=9A=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=8E=A5=E5=8F=A3=E6=9E=9A=E4=B8=BE=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=B9=B6=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/util/json/WxMpIndustryGsonAdapter.java |  7 +++++-
 .../template/WxMpTemplateIndustryTest.java    | 23 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java

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 0c4571954..04d9d7dad 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
@@ -28,7 +28,12 @@ public class WxMpIndustryGsonAdapter implements JsonSerializer<WxMpTemplateIndus
   }
 
   private WxMpTemplateIndustryEnum convertFromJson(JsonObject json) {
-    return WxMpTemplateIndustryEnum.findBySecondary(GsonHelper.getString(json, "second_class"));
+    String secondClass = GsonHelper.getString(json, "second_class");
+    if (secondClass.contains("|")) {
+      secondClass = secondClass.split("\\|")[1];
+    }
+
+    return WxMpTemplateIndustryEnum.findBySecondary(secondClass);
   }
 
 }
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
new file mode 100644
index 000000000..d5affa288
--- /dev/null
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
@@ -0,0 +1,23 @@
+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.*;
+
+/**
+ * 测试类.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * @date 2020-02-29
+ */
+public class WxMpTemplateIndustryTest {
+
+    @Test
+    public void testFromJson() {
+      String json="{\"primary_industry\":{\"first_class\":\"IT科技\",\"second_class\":\"IT软件与服务\"},\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"房地产|建筑\"}}";
+      final WxMpTemplateIndustry industry = WxMpTemplateIndustry.fromJson(json);
+      assertThat(industry).isNotNull();
+      System.out.println(industry);
+    }
+}