Merge branch 'master' into pre

# Conflicts:
#	netflix-dao/src/main/resources/mapper/CorpUserFollowRelationMapper.xml
#	netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpServiceImpl.java
#	netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

netflix-dao/src/main/java/com/cyksj/model/entity/ShopConfig.java

@@ -20,6 +20,7 @@ public class ShopConfig extends BaseEntity{
 
     /**
      * 分销提现支付宝默认商户
+     *
      */
     public static final String DISTRIBUTE_ZFB_DEFAULT_APP_ID = "2021003159660212";
 

netflix-dao/src/main/resources/mapper/CorpUserFollowRelationMapper.xml

@@ -129,7 +129,7 @@
     </select>
 
     <select id="getCorpUserFollowRelation" resultType="com.cyksj.model.entity.CorpUserFollowRelation">
-        select cufr.id
+        select cufr.*
         from (select id
               from corp_user
               where unionid = #{unionId} limit 1) cu

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -746,9 +746,8 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
         view.setStatus(score >= 50 ? "繁忙" : "空闲"); // 或“繁忙”
 
         view.setType(isPlus == 1 ? "plus" : "3.5");
-        view.setGptLimit(40); // 假设值
         int use = getCarConversationCount(carId, 3L).intValue();
-        view.setUse(Math.min(use, 40));
+        view.setUse(use);
         Long aLong = carOaiLimit(carId);
         if (aLong != 0L) {
             view.setStatus("停运");

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpServiceImpl.java

@@ -441,6 +441,7 @@ public class CorpServiceImpl implements CorpService {
 			corpUserTag.setGroupName(Constant.EP_INTENTION_GROUP_NAME);
 			corpUserTag.setTagId(tagId);
 			corpUserTag.setTagName(tagName);
+			corpUserTag.setType(1);
 			corpUserTagMapper.insert(corpUserTag);
 		} catch (Exception e) {
 			log.error("新增用户意向标签错误:{}", StringUtil.getErrorText(e));

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -551,10 +551,10 @@ public class GoodsDonController {
 //		List<Long> filter_goodsIds = getFilterGoodsIds();
 		List<Long> filter_goodsIds = null;
 		AtomicBoolean isRemoveRg = new AtomicBoolean(false);
-//		if (isHzIp()) {
-//			key += ":hz-ip";
-//			isRemoveRg.set(true);
-//		}
+		if (isHzIp()) {
+			key += ":hz-ip";
+			isRemoveRg.set(true);
+		}
 		Long fUid = StpUserUtil.getUserIdAfterLogin();
 		Object o = redisService.get(key);
 		if (o == null) {
@@ -633,7 +633,7 @@ public class GoodsDonController {
     }
 
 	public Boolean isHzIp() {
-		if (StringUtil.getRealAddressByIP(ServletUtil.getClientIP(request)).contains("杭州")) {
+		if (StringUtil.getRealAddressByIP(ServletUtil.getClientIP(request)).contains("无锡")) {
 			return true;
 		}
 		return false;
@@ -1107,10 +1107,10 @@ public class GoodsDonController {
 		String key = RedisService.key.YH_HOME_PAGHE_CACHE.getName() + "pc:homeManage";
 		//移除奈飞客厅 临时
 		Long filterConfigId = null;
-//		if (isHzIp()) {
-//			key += ":hz_ip";
-//			filterConfigId = 55l;
-//		}
+		if (isHzIp()) {
+			key += ":hz_ip";
+			filterConfigId = 55l;
+		}
 		Object o = redisService.get(key);
 		if (o == null) {
 			MapBuilder builder = MapUtils.builder()

netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/WxCorpController.java

@@ -223,7 +223,19 @@ public class WxCorpController {
 	}
 
 	public String getCorpUuid() {
-		return Optional.ofNullable(request.getHeader(CORP_UUID)).orElse(StringUtil.EMPTY);
+		Cookie[] cookies = this.request.getCookies();
+		if (cookies != null) {
+			Cookie[] var3 = cookies;
+			int var4 = cookies.length;
+
+			for(int var5 = 0; var5 < var4; ++var5) {
+				Cookie cookie = var3[var5];
+				if (cookie != null && CORP_UUID.equals(cookie.getName())) {
+					return cookie.getValue();
+				}
+			}
+		}
+		return StrUtil.EMPTY;
 	}