From b81670d969773ab17e0782f70c105452e9a34c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Thu, 27 Jul 2023 11:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=BA=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/enums/UserChannelEnum.java  | 11 +++--------
 .../service/impl/WechatMiniAppServiceImpl.java      | 13 +++++++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserChannelEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserChannelEnum.java
index 3acf218e1..bb32aa061 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserChannelEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserChannelEnum.java
@@ -7,16 +7,14 @@ package com.cool.store.enums;
  */
 public enum UserChannelEnum {
 
-    EXHIBITION("exhibition", 54644,"北京展会"),
-    RECOMMENDED("recommended", 54642,"李德龙推荐");
+    EXHIBITION("EXHIBITION","北京展会"),
+    RECOMMENDED("RECOMMENDED","李德龙推荐");
 
     private final String code;
-    private final Integer channelId;
     private final String desc;
 
-    UserChannelEnum(String code, Integer channelId, String desc) {
+    UserChannelEnum(String code,  String desc) {
         this.code = code;
-        this.channelId = channelId;
         this.desc = desc;
     }
 
@@ -24,9 +22,6 @@ public enum UserChannelEnum {
         return code;
     }
 
-    public Integer getChannelId() {
-        return channelId;
-    }
 
     public String getDesc() {
         return desc;
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
index bf0c1d5e0..0408c753f 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
@@ -64,9 +64,12 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
     private String wxAppId;
     @Value("${weixin.appSecret}")
     private String wxAppSecret;
-
     @Value("${fixMobileOpenid}")
     private String fixMobileOpenid;
+    @Value("${exhibition.channel.id}")
+    private Integer exhibition;
+    @Value("${recommended.channel.id}")
+    private Integer recommended;
 
 
     @Override
@@ -109,7 +112,13 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
                     // hyPartnerUserInfoDO.setUsername(phoneInfoDTO.getPhoneInfo().getPhoneNumber());
                     hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID());
                     hyPartnerUserInfoDO.setIsWritePartnerKnow(0);
-                    Integer channelId = param.getUserChannelEnum() != null ? param.getUserChannelEnum().getChannelId() : null;
+                    Integer channelId = null;
+                    if (param.getUserChannelEnum()!=null && UserChannelEnum.EXHIBITION.getCode().equals(param.getUserChannelEnum().getCode())){
+                        channelId = exhibition;
+                    }
+                    if (param.getUserChannelEnum()!=null && UserChannelEnum.RECOMMENDED.getCode().equals(param.getUserChannelEnum().getCode())){
+                        channelId = recommended;
+                    }
                     hyPartnerUserInfoDO.setUserChannelId(channelId);
                     hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO);
                 }