Merge branch 'master' into information-27

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/mapper/UserMapper.java
#	netflix-dao/src/main/java/com/cyksj/model/request/OrderPayRequest.java
#	netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonCategoryGoodsView.java
#	netflix-dao/src/main/java/com/cyksj/model/views/HomeManagementConfigView.java
#	netflix-service/src/main/java/com/cyksj/redis/RedisService.java
#	netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java
#	netflix-service/src/main/java/com/cyksj/service/order/OrderDonService.java
#	netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java
#	netflix-service/src/main/java/com/cyksj/service/pay/AliPayCommonService.java
#	netflix-service/src/main/java/com/cyksj/service/pay/impl/AliPayCommonServiceImpl.java
#	netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java
#	netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsUserController.java
#	netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonCategoryController.java
#	netflix-web/src/main/java/com/cyksj/web/controller/manage/home/HomeManageConfigController.java
#	netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java
#	netflix-web/src/main/java/com/cyksj/web/controller/user/UserController.java
#	netflix-web/src/main/resources/application.yml

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -108,7 +108,7 @@ public interface Constant {
 	 */
 	String QR_CODE_WX_APP_ID = "qr_code_wx_app_id";
 
-	String CHANGE_GROUPS_TRIPS_ACCOUNT = "您好，您购买的%s，账号已替换，请登陆网站https://nf.video/查看最新账号密码【银河录像局】";
+	String CHANGE_GROUPS_TRIPS_ACCOUNT = "您好，您购买的%s，密码已更换【银河录像局】";
 
 	String ACCOUNT_EXPIRY_MSG_TEMPLATE = "您好，您购买的%s，还有%s到期，请登陆网站https://nf.video/及时续费。【银河录像局】";
 
@@ -116,6 +116,13 @@ public interface Constant {
 
 	String AMERICA_APPID_SECRET = "1990-01-01 朋友 aaa111 工作 aab112 父母 aac113";
 
+	/**
+	 * 最新appid文件导入格式
+	 */
+	String NEW_APPID_SECRET = "朋友 %s 工作 %s 父母 %s 国家 %s";
+
+	String NEW_APPID_NO_COUNTRY_SECRET = "朋友 %s 工作 %s 父母 %s";
+
 	String ACCOUNT_DOUBLE_VERIFY_KEY = "account_double_verify_key";
 
 	/**
@@ -155,6 +162,11 @@ public interface Constant {
 	 */
 	String CHANNEL_360_DISCOUNT = "channel_360_discount";
 
+	/**
+	 * 百度渠道 投放链接优惠下单 系统配置key
+	 */
+	String CHANNEL_BAIDU_DISCOUNT_KEY = "channel_baidu_discount_key";
+
 	/**
 	 * GPT 平台账号重复
 	 */
@@ -164,7 +176,7 @@ public interface Constant {
 
 	String ORDER_MSG_FIRST_NOTIFY = "%s购买成功，收藏官网https://nf.video/ 合租账号就上银河录像局【银河录像局】";
 
-	String LOGIN_CODE = "yhc@36";
+	//String LOGIN_CODE = "yhc@36";
 
 	//PS AI,POE会员
 	List<Long> DOWN_GOODS_PAY = List.of(33l, 35l);
@@ -198,4 +210,44 @@ public interface Constant {
 	String USER_OPEN_SHOP_DS_ORDERS_LIMIT_KEY = "user_open_shop_ds_orders_limit_key";
 
 	String DOUBLE_VERIFY_CODE_TIMES_KEY = "double_verify_code_times_key";
+
+	/**
+	 * 活码标记key
+	 */
+	String AC_CODE_KEY = "ac_code_key:";
+
+	String AI_RENEW_MSG = "用户ID:%s续费了 %s %s 账号为:%s,请及时处理【银河录像局】";
+
+	String PAY_MSG = "用户ID:%s购买了 %s %s 请及时处理【银河录像局】";
+
+	/**
+	 * 通知手机号
+	 */
+	String SERVICE_PHONE = "18658194165";
+
+	/**
+	 * AI 车票额外座位数
+	 */
+	Integer AI_EXTRACT_NUM = 5;
+
+	/**
+	 * 百度回传 过滤平台
+	 */
+	String BAIDU_POST_FILTER_GOODS_KEY = "baidu_post_filter_goods_key";
+
+	/**
+	 * GPT Plus规格 新车队规格限制上车数
+	 */
+	List<Long> GPT_PLUS_PARKING_SKU_IDS = List.of(161l, 178l);
+
+
+	/**
+	 * 获客链接 state 标识
+	 */
+	String ACQUISTION_LINK_STATE_KEY = "customer_";
+
+	/**
+	 * 获客链接 值班客服更新定时任务id
+	 */
+	Integer CORP_LINK_JOB_ID = 192;
 }

netflix-common/src/main/java/com/cyksj/common/util/StringUtil.java

@@ -2,12 +2,12 @@ package com.cyksj.common.util;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.net.http.HttpResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -32,6 +32,10 @@ public final class StringUtil {
 	 */
 	private static final String CRLF = "\r\n";
 
+	public static final String QM = "?";
+
+	public static final String AD = "&";
+
 	/**
 	 * An empty immutable {@code String} array.
 	 */
@@ -432,7 +436,7 @@ public final class StringUtil {
 		StringBuilder sb = new StringBuilder(length);
 		for (int i = 0; i < length; i++) {
 			int number = RandomUtil.randomInt(baseLength);
-			sb.append(randomStr.charAt(number));
+			sb.append(baseStr.charAt(number));
 		}
 		return sb.toString();
 	}
@@ -478,7 +482,11 @@ public final class StringUtil {
 			return "unknown";
 		}
 		try {
-			String rspStr = HttpUtil.get("http://whois.pconline.com.cn/ipJson.jsp?ip=" + ip + "&json=true");
+			String url = String.format("http://whois.pconline.com.cn/ipJson.jsp?ip=%s" + "&json=true", ip);
+			HttpResponse<String> send = J11HttpC
+					.custom().ofGet().url(url)
+					.send(HttpResponse.BodyHandlers.ofString());
+			String rspStr = send.body();
 			if (StrUtil.isEmpty(rspStr)) {
 				return "unknown";
 			}

netflix-dao/src/main/java/com/cyksj/mapper/DistributeGoodsSkuAlertMapper.java

@@ -0,0 +1,18 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.DistributeGoodsSkuAlert;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: DistributeGoodsSkuAlertMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/8 14:10
+ */
+public interface DistributeGoodsSkuAlertMapper extends BaseMapper<DistributeGoodsSkuAlert> {
+
+	@Select("select count(*) from distribute_goods_sku_alert da inner join goods_don_sku sku on sku.id = da.sku_id and sku.status is true" +
+			" inner join goods_don g on g.id = da.goods_id and g.status is true and g.deleted is true and g.is_distribute is true")
+	Integer selectCountByCondition();
+}

netflix-dao/src/main/java/com/cyksj/mapper/GoodsDonCategoryRelateMapper.java

@@ -0,0 +1,21 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GoodsDonCategory;
+import com.cyksj.model.entity.GoodsDonCategoryRelate;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsDonCategoryRelateMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/10/7 18:14
+ */
+public interface GoodsDonCategoryRelateMapper extends BaseMapper<GoodsDonCategoryRelate> {
+
+	List<GoodsDonCategory> getCateGoryViewByGoodsId(Long goodsId);
+
+	void saveBatchGoodsRelate(@Param("goodsId") Long goodsId, @Param("list") List<Long> categoryList);
+}

netflix-dao/src/main/java/com/cyksj/mapper/GoodsDonSkuMapper.java

@@ -20,4 +20,6 @@ public interface GoodsDonSkuMapper  extends BaseMapper<GoodsDonSku> {
 	List<Long> getSpecificSkuIdsByGoodsId(@Param("goodsId") Long goodsId, @Param("num") Integer num, @Param("months") Integer months);
 
 	List<YhShopGoodsSku> selectSkuShops(@Param("list") List<Long> goodsIds);
+
+	List<Long> selectSingleSkuIdsByGoodsId(Long goodsId);
 }

netflix-dao/src/main/java/com/cyksj/mapper/GptTicketStandbyMapper.java

@@ -0,0 +1,7 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GptTicketStandby;
+
+public interface GptTicketStandbyMapper extends BaseMapper<GptTicketStandby> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/GroupsRelationAlertMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GroupsRelationAlert;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GroupsRelationAlertMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/10/26 15:14
+ */
+public interface GroupsRelationAlertMapper extends BaseMapper<GroupsRelationAlert> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/GroupsRelationExpiryRecordMapper.java

@@ -2,6 +2,9 @@ package com.cyksj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.GroupsRelationExpiryRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /*
  *项目名: netflix-job
@@ -11,4 +14,5 @@ import com.cyksj.model.entity.GroupsRelationExpiryRecord;
  */
 public interface GroupsRelationExpiryRecordMapper extends BaseMapper<GroupsRelationExpiryRecord> {
 
+	Map<String, Integer> selectRenewOrderData(@Param("followId") String followId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

netflix-dao/src/main/java/com/cyksj/mapper/GroupsRelationIndependentRenewMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GroupsRelationIndependentRenew;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GroupsRelationIndependentRenewMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/27 15:27
+ */
+public interface GroupsRelationIndependentRenewMapper extends BaseMapper<GroupsRelationIndependentRenew> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/GroupsRelationLoginCodeRecordMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GroupsRelationLoginCodeRecord;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GroupsRelationLoginCodeRecordMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/12/4 11:07
+ */
+public interface GroupsRelationLoginCodeRecordMapper extends BaseMapper<GroupsRelationLoginCodeRecord> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/GroupsRelationMapper.java

@@ -28,7 +28,7 @@ public interface GroupsRelationMapper extends BaseMapper<GroupsRelation> {
 	@Update("update groups_relation set customer_service = null where id = #{id}")
 	void updateCustomerService(Long id);
 
-	Long selectSimilarExpiredRelation(@Param("skuId") Long skuId, @Param("minExpiryTime") DateTime minExpiryTime);
+	Long selectSimilarExpiredRelation(@Param("skuId") Long skuId, @Param("minExpiryTime") DateTime minExpiryTime, @Param("maxNum") Integer maxNum);
 
 	List<GroupsRelationView> selectRelationByGoodsId(@Param("goodsId") Long goodsId, @Param("userId") Long userId, @Param("yhsId") Long yhsId);
 
@@ -52,5 +52,13 @@ public interface GroupsRelationMapper extends BaseMapper<GroupsRelation> {
 
 	Page<UserRecommendGoodsFrontView> getRecommendGoodsViews(@Param("page") Page<UserRecommendGoodsFrontView> page, @Param("list") List<Long> filter_goods_id, @Param("isPayNf") Boolean isPayNf);
 
-	Long getOutSideGroupsTripsRelationByGoodsId(@Param("skuId") Long skuId, @Param("beginOfDay") DateTime beginOfDay, @Param("extraNum") Integer extraNum, @Param("userId") Long userId);
+	Long getOutSideGroupsTripsRelationByGoodsId(@Param("skuId") Long skuId, @Param("beginOfDay") DateTime beginOfDay, @Param("extraNum") Integer extraNum, @Param("userId") Long userId, @Param("skuNum") Integer skuNum, @Param("maxNum") Integer maxNum);
+
+	Integer selectAvailableRelation(@Param("skuId") Long skuId, @Param("skuNum") Integer skuNum);
+
+	Integer selectSpecialGroupsRelationAvailable(@Param("skuId") Long skuId, @Param("maxNum") Integer maxNum, @Param("skuNum") Integer skuNum, @Param("extractNum") Integer extractNum, @Param("tenExpiry") DateTime tenExpiry);
+
+	Integer selectNumWaitingGroups(Long skuId);
+
+	Integer selectLimitAvailableNum(@Param("skuId") Long skuId, @Param("maxNum") Integer maxNum);
 }

netflix-dao/src/main/java/com/cyksj/mapper/OrderDonMapper.java

@@ -1,13 +1,11 @@
 package com.cyksj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.entity.RealGoodsInterestUser;
 import com.cyksj.model.excel.ExcelOrderDonInfo;
-import com.cyksj.model.views.BackgroundDataView;
-import com.cyksj.model.views.BrokenLineObjView;
-import com.cyksj.model.views.ChannelPopularizeView;
-import com.cyksj.model.views.ChannelStatisticsView;
+import com.cyksj.model.views.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -54,4 +52,20 @@ public interface OrderDonMapper extends BaseMapper<OrderDon> {
 	BigDecimal statisticsUsedBalance(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("noOrderAllStatus") List<String> noOrderAllStatus);
 
 	Map<String, Object> selectYhShopDistributeOrderDetail(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+	Integer selectCountActiveCodeOrderByAcId(Long acId);
+
+	Map<String, Object> selectActiveCodeOrderDetail(@Param("acId") Long acId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+	BigDecimal getOriRenewOrderMoney(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+	BigDecimal getTotalMoney(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+	BigDecimal getClearRenewOrderMoney(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+	BrokenLineObjView selectDsPlatBrokenLineMoney(@Param("sharedId") Long sharedId, @Param("first") String first, @Param("end") String end);
+
+	UserOrderDetailView getTagUserData(@Param("tagIdStr") String tagIdStr, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+	Page<UserOrderDetailView> getTagUserDataPage(@Param("page") Page<UserOrderDetailView> page, @Param("tagIdStr") String tagIdStr, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

netflix-dao/src/main/java/com/cyksj/mapper/UserDistributeSharedRelateUnbindMapper.java

@@ -0,0 +1,17 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserDistributeSharedRelateUnbind;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: UserDistributeSharedRelateUnbindMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/12/6 15:38
+ */
+public interface UserDistributeSharedRelateUnbindMapper extends BaseMapper<UserDistributeSharedRelateUnbind> {
+	void batchInsert(@Param("list") List<Long> userBind);
+}

netflix-dao/src/main/java/com/cyksj/mapper/UserLoginRecordMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserLoginRecord;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: UserLoginRecordMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/12/13 18:01
+ */
+public interface UserLoginRecordMapper extends BaseMapper<UserLoginRecord> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/UserMapper.java

@@ -36,8 +36,8 @@ public interface UserMapper extends BaseMapper<User> {
     @Update("update user set points = points - #{deductPoints} where id = #{id} and points = #{originalPoints}")
     Integer subPointsNegative(@Param("id") Long userId, @Param("originalPoints") BigDecimal originalPoints, @Param("deductPoints") BigDecimal deductPoints);
 
-    @Update("update user set balance = balance - #{deduct} where id = #{userId} and balance >= #{deduct}")
-    Integer deductBalance(@Param("userId") Long userId, @Param("deduct") BigDecimal deduct);
+    @Update("update user set balance = balance - #{deduct} where id = #{userId} and balance = #{userBalance} and balance >= #{deduct}")
+    Integer deductBalance(@Param("userId") Long userId, @Param("deduct") BigDecimal deduct, @Param("userBalance") BigDecimal userBalance);
 
     @Update("update user set balance = balance + #{returnBalance} where id = #{userId} and balance = #{userBalance}")
     Integer returnBalance(@Param("userId") Long userId, @Param("returnBalance") BigDecimal returnBalance, @Param("userBalance") BigDecimal userBalance);
@@ -63,10 +63,5 @@ public interface UserMapper extends BaseMapper<User> {
     @Update("update user set yhs_money = yhs_money - #{subMoney} where id = #{shopUserId} and yhs_money >= #{subMoney} and yhs_money > 0")
     Integer subYhsMoney(@Param("shopUserId") Long shopUserId, @Param("subMoney") BigDecimal subMoney);
 
-    @Update("update user set galaxycoin = galaxycoin - (${subGalaxycoin}) where id = #{id} and galaxycoin >= #{subGalaxycoin}")
-    Integer deductGalaxycoin(@Param("id") Long id, @Param("subGalaxycoin") BigDecimal subGalaxycoin);
-
-    @Update("update user set galaxycoin = galaxycoin + (${addGalaxycoin}) where id = #{id} and galaxycoin = #{originalGalaxycoin}")
-    Integer updateGalaxycoin(@Param("id") Long id, @Param("originalGalaxycoin") BigDecimal originalGalaxycoin, @Param("addGalaxycoin") BigDecimal addGalaxycoin);
-
+	Integer selectUnBindUserNum();
 }

netflix-dao/src/main/java/com/cyksj/mapper/UserPayOrderBlockMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserPayOrderBlock;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: UserPayOrderBlockMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/12/13 16:35
+ */
+public interface UserPayOrderBlockMapper extends BaseMapper<UserPayOrderBlock> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpCustomerAcquisitionLinkMapper.java

@@ -0,0 +1,15 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpCustomerAcquisitionLink;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * @author chan
+ * @date 2023/11/28 14:21
+ */
+public interface CorpCustomerAcquisitionLinkMapper extends BaseMapper<CorpCustomerAcquisitionLink> {
+
+    @Select("select cl.* from corp_customer_acquisition_link cl, corp_customer_acquisition_link_popularize clp where cl.id = clp.customer_acquistion_link_id and clp.id = #{linkId}")
+    CorpCustomerAcquisitionLink getByLinkPopularizeId(Long linkId);
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpCustomerAcquisitionLinkPopularizeMapper.java

@@ -0,0 +1,11 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpCustomerAcquisitionLinkPopularize;
+
+/**
+ * @author chan
+ * @date 2023/11/28 14:22
+ */
+public interface CorpCustomerAcquisitionLinkPopularizeMapper extends BaseMapper<CorpCustomerAcquisitionLinkPopularize> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpFollowActiveCodeClickRecordMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpFollowActiveCodeClickRecord;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpFollowActiveCodeClickRecordMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/10/9 16:28
+ */
+public interface CorpFollowActiveCodeClickRecordMapper extends BaseMapper<CorpFollowActiveCodeClickRecord> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpFollowActiveCodeMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpFollowActiveCode;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpFollowActiveCodeMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/10/9 16:27
+ */
+public interface CorpFollowActiveCodeMapper extends BaseMapper<CorpFollowActiveCode> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpGroupChatMemberMapper.java

@@ -0,0 +1,23 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpGroupChatMember;
+import com.cyksj.model.response.corp.CorpGroupChatMemberObj;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/*
+ *项目名: netflix
+ *文件名: CorpGroupChatMemberMapper
+ *创建者: JavaZou
+ *创建时间:2023/8/8 13:45
+ */
+public interface CorpGroupChatMemberMapper extends BaseMapper<CorpGroupChatMember> {
+
+	void batchInsert(@Param("groupChatId") Long groupChatId, @Param("wxCorpId") Long wxCorpId, @Param("memberList") List<CorpGroupChatMemberObj> memberList);
+
+	List<String> getAllMemberByCorpIdAndChatId(Long groupChatId);
+
+	void batchDeleteByChatIdAndUserId(@Param("groupChatId") Long groupChatId, @Param("delUserIds") List<String> delUserIds);
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpInteractiveRadarMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpInteractiveRadar;
+
+/*
+ *项目名: netflix
+ *文件名: CorpInteractiveRadarMapper
+ *创建者: JavaZou
+ *创建时间:2023/8/4 17:34
+ */
+public interface CorpInteractiveRadarMapper extends BaseMapper<CorpInteractiveRadar> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpInteractiveRadarUserRecordMapper.java

@@ -0,0 +1,19 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpInteractiveRadarUserRecord;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Map;
+
+/*
+ *项目名: netflix
+ *文件名: CorpInteractiveRadarUserRecordMapper
+ *创建者: JavaZou
+ *创建时间:2023/8/4 18:31
+ */
+public interface CorpInteractiveRadarUserRecordMapper extends BaseMapper<CorpInteractiveRadarUserRecord> {
+
+	@Select("select count(*) clickNum,count(distinct user_id) clickUserNum from corp_interactive_radar_user_record where radar_id = #{radarId}")
+	Map<String, Long> selectClickRecord(Long radarId);
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpInteractiveUserOrderRelationMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpInteractiveUserOrderRelation;
+
+/*
+ *项目名: netflix
+ *文件名: CorpInteractiveUserOrderRelationMapper
+ *创建者: JavaZou
+ *创建时间:2023/8/8 16:11
+ */
+public interface CorpInteractiveUserOrderRelationMapper extends BaseMapper<CorpInteractiveUserOrderRelation> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpMsgBulkTaskCategoryMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpMsgBulkTaskCategory;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpMsgBulkTaskCategoryMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/12/11 10:21
+ */
+public interface CorpMsgBulkTaskCategoryMapper extends BaseMapper<CorpMsgBulkTaskCategory> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpTagGroupMapper.java

@@ -7,8 +7,6 @@ import com.cyksj.model.views.CorpTagBackView;
 import com.cyksj.model.views.CorpTagGroupView;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Map;
-
 /*
  *项目名: netflix
  *文件名: CorpTagGroupMapper
@@ -20,7 +18,7 @@ public interface CorpTagGroupMapper extends BaseMapper<CorpTagGroup> {
 
 	Page<CorpTagGroupView> getCorpTagList(@Param("groupName") String groupName, @Param("page") Page<CorpTagGroupView> page);
 
-	Page<CorpTagBackView> getCorpTagBackView(@Param("page") Page<CorpTagBackView> page, @Param("groupIds") String[] groupIds, @Param("sort") String sort, @Param("order") String order, @Param("wxCorpId") Long wxCorpId);
+	Page<CorpTagBackView> getCorpTagBackView(@Param("page") Page<CorpTagBackView> page, @Param("groupName") String groupName, @Param("sort") String sort, @Param("order") String order, @Param("wxCorpId") Long wxCorpId);
 
 	CorpTagBackView fillCorpGroupTagInfo(@Param("groupId") String groupId, @Param("wxCorpId") Long wxCorpI);
 }

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpTagMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  *创建时间:2022/10/13 18:07
  */
 public interface CorpTagMapper extends BaseMapper<CorpTag> {
-	Page<CorpTagBackView> getCorpTagBackView(@Param("page") Page<CorpTagBackView> page, @Param("tagIds") String[] tagIds, @Param("sort") String sort, @Param("order") String order, @Param("wxCorpId") Long wxCorpId);
+	Page<CorpTagBackView> getCorpTagBackView(@Param("page") Page<CorpTagBackView> page, @Param("tagName") String tagName, @Param("groupIds") String[] groupIds, @Param("sort") String sort, @Param("order") String order, @Param("wxCorpId") Long wxCorpId);
 
 	List<String> selectTagsIdByGroupId(String groupId);
 

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpUserFollowRelationMapper.java

@@ -15,7 +15,9 @@ public interface CorpUserFollowRelationMapper extends BaseMapper<CorpUserFollowR
 
 	String selectCorpCustomers(@Param("unionid") String unionid, @Param("wxCorpId") Long wxCorpId);
 
-	List<CorpUserFollowRelationDto> selectCorpUserFollowRelationByTagIds(@Param("list") List<String> tagIds, @Param("wxCorpId") Long wxCorpId, @Param("followIds") List<String> followIds);
+	List<CorpUserFollowRelationDto> selectCorpUserFollowRelationByTagIds(@Param("list") List<String> tagIds, @Param("wxCorpId") Long wxCorpId, @Param("followIds") List<String> followIds, @Param("userScope") Integer userScope, @Param("consumerScope") Integer consumerScope);
 
 	List<CorpUserFollowRelationDto> selectCorpUserFollowRelation(@Param("wxCorpId") Long wxCorpId, @Param("followIds") List<String> service_follow_ids);
+
+	List<CorpUserFollowRelationDto> selectCorpUserNotUnderTagIds(@Param("list") List<String> tagIds, @Param("wxCorpId") Long wxCorpId, @Param("followIds") List<String> followIds, @Param("userScope") Integer userScope, @Param("consumerScope") Integer consumerScope);
 }

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpUserMapper.java

@@ -2,6 +2,7 @@ package com.cyksj.mapper.corp;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.CorpUser;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 
@@ -12,4 +13,8 @@ import org.apache.ibatis.annotations.Select;
 public interface CorpUserMapper extends BaseMapper<CorpUser> {
 	@Select("select cu.id,cu.user_id,cu.unionid from (select corp_user_id from corp_user_auth where external_userid = #{corpUserId} limit 1) cua inner join corp_user cu on cu.id = cua.corp_user_id and cu.unionid != '' limit 1")
 	CorpUser setCorpUserUserId(String corpUserId);
+
+	@Select("select u.id from (select corp_user_id from corp_user_auth where wx_corp_id = #{wxCorpId} and external_userid = #{corpUserId} limit 1) ca inner join corp_user cu on cu.id = ca.corp_user_id and cu.unionid != ''" +
+			" inner join user u on u.uionid = cu.unionid")
+	Long selectUserIdByCropUserId(@Param("wxCorpId") Long wxCorpId, @Param("corpUserId") String corpUserId);
 }

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpUserRelateMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpUserRelate;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpUserRelateMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/23 11:06
+ */
+public interface CorpUserRelateMapper extends BaseMapper<CorpUserRelate> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/corp/CorpWelcomeTemplateMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.CorpWelcomeTemplate;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpWelcomeTemplateMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/12/5 18:21
+ */
+public interface CorpWelcomeTemplateMapper extends BaseMapper<CorpWelcomeTemplate> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/manage/coupon/CouponDistributePopularizeMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.List;
+
 /*
  *项目名: netflix
  *文件名: CouponDistributePopularizeMapper
@@ -19,4 +21,6 @@ public interface CouponDistributePopularizeMapper extends BaseMapper<CouponDistr
 
 	@Select("select distinct c.* from (select * from coupon_distribute_popularize where distribute_id = #{distributeId} and deleted is true) cp inner join coupon c on c.id = cp.coupon_id and type = 'discount' inner join coupon_sku cs on cs.coupon_id = c.id and cs.sku_id = #{skuId} order by c.discount desc limit 1")
 	Coupon selectDiscountCouponByUserId(@Param("distributeId") Long distributeId, @Param("skuId") Long skuId);
+
+	void batchInsert(@Param("list") List<CouponDistributePopularize> couponRelates);
 }

netflix-dao/src/main/java/com/cyksj/mapper/manage/coupon/CouponMapper.java

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Select;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 /*
  *项目名: netflix
@@ -29,4 +30,8 @@ public interface CouponMapper extends BaseMapper<Coupon> {
 
 	@Select("select name from coupon where id = #{couponId}")
 	String getCouponNameById(Long couponId);
+
+	String getCouponNameByIds(List<Long> couponIds);
+
+	Coupon getRenewCouponBySkuId(@Param("skuId") Long skuId, @Param("couponIds") Set<Long> couponIds, @Param("userId") Long userId);
 }

netflix-dao/src/main/java/com/cyksj/mapper/manage/distribute/BusinessDistributeDefaultSkuRateConfigMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.manage.distribute;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.BusinessDistributeDefaultSkuRateConfig;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: BusinessDistributeDefaultSkuRateConfigMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/15 16:17
+ */
+public interface BusinessDistributeDefaultSkuRateConfigMapper extends BaseMapper<BusinessDistributeDefaultSkuRateConfig> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/manage/distribute/UserDistributeBusinessGeneralRateMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.manage.distribute;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserDistributeBusinessGeneralRate;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: UserDistributeBusinessGeneralRateMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/8 14:46
+ */
+public interface UserDistributeBusinessGeneralRateMapper extends BaseMapper<UserDistributeBusinessGeneralRate> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/manage/distribute/UserDistributeBusinessRateMapper.java

@@ -17,4 +17,6 @@ public interface UserDistributeBusinessRateMapper extends BaseMapper<UserDistrib
 	List<Long> selectNoThisGoodsDistribute(Long goodsId);
 
 	void batchInsertDistributePlatRate(@Param("list") List<UserPlatDistributeRate> part);
+
+	void insertOrUpdateBusinessGoodsSkuRate(@Param("list") List<Long> businessIds, @Param("goodsId") Long goodsId, @Param("skuId") Long skuId, @Param("firstOrderRate") Integer firstOrderRate, @Param("renewOrderRate") Integer renewOrderRate);
 }

netflix-dao/src/main/java/com/cyksj/mapper/manage/distribute/UserDistributeTargetAlertMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.manage.distribute;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserDistributeTargetAlert;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: UserDistributeTargetAlertMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/22 16:10
+ */
+public interface UserDistributeTargetAlertMapper extends BaseMapper<UserDistributeTargetAlert> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/manage/distribute/UserDistributeTargetAlertRecordMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.manage.distribute;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserDistributeTargetAlertRecord;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: UserDistributeTargetAlertRecord
+ * 创建者: JavaZou
+ * 创建时间:2023/11/23 16:39
+ */
+public interface UserDistributeTargetAlertRecordMapper extends BaseMapper<UserDistributeTargetAlertRecord> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/manage/distribute/UserPlatSkuDistributeRateMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.manage.distribute;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserPlatSkuDistributeRate;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: UserPlatSkuDistributeRateMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/14 13:40
+ */
+public interface UserPlatSkuDistributeRateMapper extends BaseMapper<UserPlatSkuDistributeRate> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/manage/statistics/StatisticsExportMapper.java

@@ -1,6 +1,7 @@
 package com.cyksj.mapper.manage.statistics;
 
 import cn.hutool.core.date.DateTime;
+import com.cyksj.model.dto.NatureOrderDataDto;
 import com.cyksj.model.excel.statistics.ExcelAppleOneData;
 import org.apache.ibatis.annotations.Param;
 
@@ -68,4 +69,6 @@ public interface StatisticsExportMapper{
 	Integer getAppleOnePayMonthTypeOrderThisMonth(@Param("skuId") Long skuId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
 	Map<String, BigDecimal> getTransferData(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+	List<NatureOrderDataDto> getGroupsOrderData(@Param("startDate") String startDate, @Param("endDate") String endDate);
 }

netflix-dao/src/main/java/com/cyksj/mapper/shop/YhShopGeneralGoodsRateMapper.java

@@ -1,13 +0,0 @@
-package com.cyksj.mapper.shop;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.YhShopGeneralGoodsRate;
-
-/*
- *项目名: yhlxj
- *文件名: YhShopGeneralGoodsRateMapper
- *创建者: JavaZou
- *创建时间:2023/9/15 17:35
- */
-public interface YhShopGeneralGoodsRateMapper extends BaseMapper<YhShopGeneralGoodsRate> {
-}

netflix-dao/src/main/java/com/cyksj/mapper/shop/YhShopUserBusinessDefaultRateConfigMapper.java

@@ -1,13 +0,0 @@
-package com.cyksj.mapper.shop;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.YhShopUserBusinessDefaultRateConfig;
-
-/*
- *项目名: yhlxj
- *文件名: YhShopUserBusinessDefaultRateConfigMapper
- *创建者: JavaZou
- *创建时间:2023/9/18 17:05
- */
-public interface YhShopUserBusinessDefaultRateConfigMapper extends BaseMapper<YhShopUserBusinessDefaultRateConfig> {
-}

netflix-dao/src/main/java/com/cyksj/mapper/shop/YhShopUserDistributeBusinessRateMapper.java

@@ -1,13 +0,0 @@
-package com.cyksj.mapper.shop;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.YhShopUserDistributeBusinessRate;
-
-/*
- *项目名: yhlxj
- *文件名: YhShopUserDistributeBusinessRateMapper
- *创建者: JavaZou
- *创建时间:2023/9/18 17:29
- */
-public interface YhShopUserDistributeBusinessRateMapper extends BaseMapper<YhShopUserDistributeBusinessRate> {
-}

netflix-dao/src/main/java/com/cyksj/mapper/stock/GoodsDonStockRecordMapper.java

@@ -2,10 +2,15 @@ package com.cyksj.mapper.stock;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.GoodsDonStockRecord;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * @author chan
  * @date 2022/12/6 4:13 PM
  */
 public interface GoodsDonStockRecordMapper extends BaseMapper<GoodsDonStockRecord> {
+
+	@Select("select * from goods_don_stock_record where stock_id = #{stockId} and type = #{type} and available < num and is_undo is ${isUndo} order by stock_id limit 1")
+	GoodsDonStockRecord selectUndoRecord(@Param("stockId") Long stockId, @Param("isUndo") Boolean isUndo, @Param("type") String type);
 }

netflix-dao/src/main/java/com/cyksj/mapper/stock/GoodsSkuStockRelateChangeRecordMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.stock;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GoodsSkuStockRelateChangeRecord;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsSkuStockRelateChangeRecordMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/2 17:34
+ */
+public interface GoodsSkuStockRelateChangeRecordMapper extends BaseMapper<GoodsSkuStockRelateChangeRecord> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/sys/SysConfigChangeRecordMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.sys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.SysConfigChangeRecord;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: SysConfigChangeRecordMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/24 10:43
+ */
+public interface SysConfigChangeRecordMapper extends BaseMapper<SysConfigChangeRecord> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/SysConfigMapper.java → netflix-dao/src/main/java/com/cyksj/mapper/sys/SysConfigMapper.java

@@ -1,4 +1,4 @@
-package com.cyksj.mapper;
+package com.cyksj.mapper.sys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.SysConfig;

netflix-dao/src/main/java/com/cyksj/mapper/sys/SysEmailMapper.java

@@ -0,0 +1,17 @@
+package com.cyksj.mapper.sys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.SysEmail;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: SysEmailMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/11/14 16:19
+ */
+public interface SysEmailMapper extends BaseMapper<SysEmail> {
+	void batchInsert(@Param("list") List<SysEmail> data);
+}

netflix-dao/src/main/java/com/cyksj/mapper/sys/SysFuncTimingShelfMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.sys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.SysFuncTimingShelf;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: SysFuncTimingShelfMapper
+ * 创建者: JavaZou
+ * 创建时间:2023/12/28 10:27
+ */
+public interface SysFuncTimingShelfMapper extends BaseMapper<SysFuncTimingShelf> {
+}

netflix-dao/src/main/java/com/cyksj/model/dto/CorpFollowActiveCodeDto.java

@@ -0,0 +1,36 @@
+package com.cyksj.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpFollowActiveCodeDto
+ * 创建者: JavaZou
+ * 创建时间:2023/10/9 17:10
+ */
+
+@Getter
+@Setter
+public class CorpFollowActiveCodeDto {
+
+	/**
+	 * 企业微信的客服id 数组
+	 */
+	private String followIds;
+
+	/**
+	 * 对应系统配置的客服
+	 */
+	private String serviceNames;
+
+	/**
+	 * 配置id
+	 */
+	private String configId;
+
+	/**
+	 * 活码
+	 */
+	private String qrCode;
+}

netflix-dao/src/main/java/com/cyksj/model/dto/CorpFollowServiceDto.java

@@ -0,0 +1,21 @@
+package com.cyksj.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpFollowServiceDto
+ * 创建者: JavaZou
+ * 创建时间:2023/12/21 10:15
+ */
+@Getter
+@Setter
+public class CorpFollowServiceDto {
+
+	private String name;
+
+	private Integer indx;
+
+	private String followId;
+}

netflix-dao/src/main/java/com/cyksj/model/dto/NatureOrderDataDto.java

@@ -0,0 +1,20 @@
+package com.cyksj.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: NatureOrderDataDto
+ * 创建者: JavaZou
+ * 创建时间:2023/10/18 11:03
+ */
+@Getter
+@Setter
+public class NatureOrderDataDto {
+	private Integer type;
+
+	private BigDecimal money;
+}

netflix-dao/src/main/java/com/cyksj/model/dto/YhServiceDto.java

@@ -0,0 +1,74 @@
+package com.cyksj.model.dto;
+
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalTime;
+import java.util.List;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: YhServiceDto
+ * 创建者: JavaZou
+ * 创建时间:2023/10/10 16:12
+ */
+@Getter
+@Setter
+public class YhServiceDto {
+	private String startTime;
+
+	private String endTime;
+
+	@JsonProperty("indx")
+	private Integer index;
+
+	/**
+	 * workday工作日 Saturday周六 Sunday周日 holiday节假日
+	 */
+	private String sign;
+
+	private List<CustomerServiceDto> select;
+
+	private String secondStartTime;
+
+	private String secondEndTime;
+
+	private String sortTime;
+
+	private String date;
+
+
+	@Getter
+	@Setter
+	public static class CustomerServiceDto {
+		private String name;
+
+		private String img;
+
+		@JsonProperty("indx")
+		private Integer index;
+
+		private String url;
+
+		private String followId;
+	}
+
+	public Boolean isBetween(LocalTime currentTime) {
+		return (!LocalTime.parse(startTime).isAfter(currentTime) && LocalTime.parse(endTime).isAfter(currentTime))
+				|| (!StrUtil.hasEmpty(secondStartTime, secondEndTime) && !LocalTime.parse(secondStartTime).isAfter(currentTime) && LocalTime.parse(secondEndTime).isAfter(currentTime));
+	}
+
+	public Boolean isAfter(LocalTime currentTime) {
+		if (LocalTime.parse(startTime).isAfter(currentTime)) {
+			this.sortTime = startTime;
+			return true;
+		}
+		if ((!StrUtil.hasEmpty(secondStartTime) && (LocalTime.parse(secondStartTime).isAfter(currentTime)))) {
+			this.sortTime = secondStartTime;
+			return true;
+		}
+		return false;
+	}
+}

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

@@ -54,6 +54,11 @@ public class Account extends BaseEntity {
      */
     private String apiKey;
 
+    /**
+     * chatGpt 邮箱密码
+     */
+    private String gptEmailPwd;
+
     /**
      * 辅助邮箱
      */
@@ -85,4 +90,14 @@ public class Account extends BaseEntity {
      * gpt accesToken
      */
     private String gptRefreshToken;
+
+    /**
+     * 备用账号类型sku_ids
+     */
+    private String preSkuIds;
+
+    /**
+     * 类型 1通用 2备用
+     */
+    private Integer type;
 }

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

@@ -0,0 +1,31 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: BusinessDistributeDefaultSkuRateConfig
+ * 创建者: JavaZou
+ * 创建时间:2023/11/15 16:16
+ */
+@Getter
+@Setter
+public class BusinessDistributeDefaultSkuRateConfig extends BaseEntity {
+	/**
+	 * 平台id
+	 */
+	private Long goodsId;
+
+	private Long skuId;
+
+	/**
+	 * 分销比例
+	 */
+	private Integer rate;
+
+	/**
+	 * 套餐分销比例
+	 */
+	private Integer secondRate;
+}

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

@@ -0,0 +1,96 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author chan
+ * @date 2023/11/9 17:06
+ */
+@Data
+public class CorpCustomerAcquisitionLink extends BaseEntity {
+
+
+    private String linkId;
+
+
+    /**
+     * 链接名称
+     */
+    private String linkName;
+
+    /**
+     * url
+     */
+    private String url;
+
+    /**
+     * 创建事件
+     */
+    private Long createTime;
+
+    /**
+     * 是否值班 默认不值班false
+     */
+    private Boolean isDuty;
+
+    /**
+     * 用户列表
+     */
+    private String userList;
+
+    /**
+     * 客服选择
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String chooseDutyUsers;
+
+
+    /**
+     * 是否为无验证
+     */
+    private Boolean skipVerify;
+
+
+    /**
+     * 客户标签
+     */
+    private String tags;
+
+
+    /**
+     *  成员名称
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private List<String> userStrList;
+
+    /**
+     * 客服选择
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private List<String> chooseDutyUserList;
+
+    /**
+     *  标签名称
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private List<String> tagStrList;
+
+    /**
+     * 模板id
+     */
+    private Long msgId;
+
+
+    @TableField(exist = false)
+    @DbIgnore
+    private String msgName;
+
+}

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

@@ -0,0 +1,42 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import lombok.Data;
+
+/**
+ * @author chan
+ * @date 2023/11/9 17:40
+ */
+@Data
+public class CorpCustomerAcquisitionLinkPopularize extends BaseEntity {
+
+    private Long popularizeId;
+
+    private Long customerAcquistionLinkId;
+
+    /**
+     * 1.加粉 2.深度回传
+     */
+    private Integer type;
+
+    /**
+     * 回传事件
+     */
+    private String event;
+
+    /**
+     * 前置回传
+     */
+    private String addEvent;
+
+    /**
+     * 监测时间
+     */
+    private Long time;
+
+    @TableField(exist = false)
+    @DbIgnore
+    private String url;
+
+}

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

@@ -1,5 +1,6 @@
 package com.cyksj.model.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -9,6 +10,7 @@ import java.io.Serializable;
  * @date 2022/3/14 下午7:23
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CorpFollow extends BaseEntity implements Serializable {
 
     private Long wxCorpId;
@@ -18,6 +20,11 @@ public class CorpFollow extends BaseEntity implements Serializable {
      */
     private String userid;
 
+    /**
+     * 银河后台客服id
+     */
+    private Long cmsUserId;
+
     /**
      * 成员名称
      */

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

@@ -0,0 +1,83 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.cyksj.model.request.corp.Attachments;
+import com.ejlchina.searcher.bean.DbIgnore;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpFollowActiveCode
+ * 创建者: JavaZou
+ * 创建时间:2023/10/9 16:23
+ */
+@Getter
+@Setter
+public class CorpFollowActiveCode extends BaseEntity{
+
+	@NotEmpty(message = "活码标题不为空")
+	private String name;
+
+	@TableField(exist = false)
+	@DbIgnore
+	@NotNull(message = "请选择对应客服")
+	private List<String> followIds;
+
+	/**
+	 * 客服
+	 */
+	private String followStr;
+
+	/**
+	 * 欢迎语模板id
+	 */
+	private Long msgId;
+
+	/**
+	 * 欢迎语内容 文本、附件
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String text;
+
+	@TableField(exist = false)
+	@DbIgnore
+	private List<Attachments> attachments;
+
+	/**
+	 * 附件字符串
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String attachmentsStr;
+
+	/**
+	 * 活码
+	 */
+	private String codeStr;
+
+
+	/**
+	 * 客户标签
+	 */
+	@NotEmpty(message = "标签不为空")
+	private String markTag;
+
+	/**
+	 * 是否值班
+	 */
+	private Boolean isDuty;
+
+	/**
+	 * 创建者
+	 */
+	private String operator;
+
+	private Long couponId;
+
+	private Boolean deleted;
+}

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

@@ -0,0 +1,16 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpFollowActiveCodeClickRecord
+ * 创建者: JavaZou
+ * 创建时间:2023/10/9 16:28
+ */
+@Getter
+@Setter
+public class CorpFollowActiveCodeClickRecord extends BaseEntity{
+	private Long acId;
+}

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

@@ -1,8 +1,11 @@
 package com.cyksj.model.entity;
 
+import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /*
  *项目名: netflix
  *文件名: CorpGroupChat
@@ -11,14 +14,23 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@Builder
 public class CorpGroupChat extends BaseEntity{
 	private String chatId;
 
 	private String chatName;
 
+	private String owner;
+
 	private Long wxCorpId;
 
+	private String corpId;
+
 	private Long goodsId;
 
 	private String configId;
+
+	private Date groupCreateTime;
+
+	private Boolean deleted;
 }

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

@@ -0,0 +1,38 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: CorpGroupChatMember
+ *创建者: JavaZou
+ *创建时间:2023/8/8 13:46
+ */
+@Getter
+@Setter
+public class CorpGroupChatMember extends BaseEntity{
+	private Long groupChatId;
+
+	private Long wxCorpId;
+
+	private String corpUserId;
+
+	private Long userId;
+
+	private Integer type;
+
+	private String unionid;
+
+	private Long joinTime;
+
+	private Integer joinScene;
+
+	private String groupName;
+
+	private String name;
+
+	private String inviterUserId;
+
+	private Boolean deleted;
+}

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

@@ -0,0 +1,39 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/*
+ *项目名: netflix
+ *文件名: CorpInteractiveRadar
+ *创建者: JavaZou
+ *创建时间:2023/8/4 17:01
+ */
+@Getter
+@Setter
+public class CorpInteractiveRadar extends BaseEntity{
+	@NotEmpty(message = "雷达标题不为空")
+	private String title;
+
+	@NotEmpty(message = "雷达链接不为空")
+	private String url;
+
+	/**
+	 * 1、企业微信,2、普通
+	 */
+	@NotNull(message = "雷达类型不为空")
+	private Integer type;
+
+	private Integer wxCorpId;
+
+	@TableField(exist = false)
+	private CorpInteractiveReaderLink linkInfo;
+
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String linkInfoStr;
+}

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

@@ -0,0 +1,20 @@
+package com.cyksj.model.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author chan
+ * @date 2023/5/10 3:54 PM
+ * 互动记录
+ */
+@Data
+@Accessors(chain = true)
+public class CorpInteractiveRadarUserRecord extends BaseEntity {
+
+    private Long radarId;
+
+    private Long userId;
+
+    private Long corpUserId;
+}

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

@@ -0,0 +1,20 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: CorpInteractiveReaderLink
+ *创建者: JavaZou
+ *创建时间:2023/8/4 17:07
+ */
+@Getter
+@Setter
+public class CorpInteractiveReaderLink {
+	private String title;
+
+	private String desc;
+
+	private String img;
+}

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

@@ -0,0 +1,25 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: CorpInteractiveUserOrderRelation
+ *创建者: JavaZou
+ *创建时间:2023/8/8 16:11
+ */
+@Getter
+@Setter
+public class CorpInteractiveUserOrderRelation extends BaseEntity{
+	private Long radarId;
+
+	private Long orderId;
+
+	private Long userId;
+
+	/**
+	 * 1新用户,0老用户
+	 */
+	private Boolean isNew;
+}

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

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Arrays;
@@ -33,6 +32,19 @@ public class CorpMsgBulkTask implements Serializable {
 	@TableId(value = "id", type = IdType.AUTO)
 	private Long id;
 
+	/**
+	 * 分类id
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long category;
+
+	/**
+	 * 分类名
+	 */
+	@TableField(exist = false)
+	@DbIgnore
+	private String categoryName;
+
 	/**
 	 * 企业微信id
 	 */
@@ -41,7 +53,7 @@ public class CorpMsgBulkTask implements Serializable {
 	/**
 	 * 群发任务选择标签
 	 */
-	@NotEmpty(message = "标签不能为空")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String chooseTagStr;
 
 	/**
@@ -51,6 +63,12 @@ public class CorpMsgBulkTask implements Serializable {
 	@DbIgnore
 	private Integer tagSize;
 
+	/**
+	 * 标签组
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String tagGroups;
+
 	/**
 	 * 群发内容 文本、附件
 	 */
@@ -79,7 +97,7 @@ public class CorpMsgBulkTask implements Serializable {
 	 * 优惠券id
 	 */
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
-	private Long couponId;
+	private String couponIds;
 
 	@DbIgnore
 	@TableField(exist = false)
@@ -114,6 +132,22 @@ public class CorpMsgBulkTask implements Serializable {
 	 */
 	private Boolean status;
 
+	/**
+	 * 1全部、2银河用户、3非银河用户
+	 */
+	private Integer userScope;
+
+	/** 发送范围 默认2标签用户
+	 * 1.全部用户、2标签用户
+	 */
+	private Integer sendScope;
+
+	/**
+	 * 消费范围
+	 * 1全部 2消费 3未消费
+	 */
+	private Integer consumerScope;
+
 	private Boolean deleted;
 
 	/**

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

@@ -0,0 +1,19 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpMsgBulkTaskCategory
+ * 创建者: JavaZou
+ * 创建时间:2023/12/11 10:21
+ */
+@Getter
+@Setter
+public class CorpMsgBulkTaskCategory extends BaseEntity{
+	@NotEmpty(message = "分类名不为空")
+	private String name;
+}

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

@@ -21,6 +21,8 @@ public class CorpTagGroup extends BaseEntity implements Serializable {
      */
     private String groupName;
 
+    private String remark;
+
     /**
      * 排序
      */

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

@@ -38,4 +38,9 @@ public class CorpTagRuleRelation extends BaseEntity{
 	 * 下单状态
 	 */
 	private Integer orderStatus;
+
+	/**
+	 * 规格类型 0全部，1年付
+	 */
+	private Integer skuType;
 }

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

@@ -47,4 +47,19 @@ public class CorpUser extends BaseEntity implements Serializable {
 	 * 添加渠道来源
 	 */
 	private String state;
+
+	/**
+	 * 活动活码id
+	 */
+	private Long acId;
+
+	/**
+	 * 获客助手链接id
+	 */
+	private Long customerAcquisitionLinkId;
+
+	/**
+	 * 客服标记内容
+	 */
+	private String markInfo;
 }

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

@@ -0,0 +1,18 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpUserRelate
+ * 创建者: JavaZou
+ * 创建时间:2023/11/23 11:06
+ */
+@Getter
+@Setter
+public class CorpUserRelate extends BaseEntity{
+	private Long corpUserId;
+
+	private String phone;
+}

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

@@ -0,0 +1,72 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.cyksj.model.request.corp.Attachments;
+import com.ejlchina.searcher.bean.DbIgnore;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpWelcomeTemplate
+ * 创建者: JavaZou
+ * 创建时间:2023/12/5 18:19
+ */
+@Getter
+@Setter
+public class CorpWelcomeTemplate extends BaseEntity {
+	@NotEmpty(message = "模板名不为空")
+	private String name;
+
+	@NotNull
+	private Integer type;
+
+	/**
+	 * 群发文本内容
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String text;
+
+	@TableField(exist = false)
+	@DbIgnore
+	private List<Attachments> attachments;
+
+	/**
+	 * 附件字符串
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String attachmentsStr;
+
+	/**
+	 * 优惠券id
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long couponId;
+
+	@DbIgnore
+	@TableField(exist = false)
+	private String couponName;
+
+	private Boolean deleted;
+
+	@Getter
+	public enum Type {
+		natural("自然流量"), activeCode("渠道活码"), follow("加分链接");
+
+		String desc;
+
+		Type(String desc) {
+			this.desc = desc;
+		}
+
+		public static Boolean checkType(Integer type) {
+			return Arrays.stream(Type.values()).filter(t -> t.ordinal() == type.intValue()).findAny().isPresent();
+		}
+	}
+}

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

@@ -1,9 +1,13 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /*
  *项目名: netflix
  *文件名: CouponRecommend
@@ -20,6 +24,12 @@ public class CouponRecommend extends BaseEntity {
 	 */
 	private Boolean status;
 
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Date upTime;
+
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Date downTime;
+
 	@TableLogic(value = "1", delval = "0")
 	private Boolean deleted;
 }

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

@@ -70,6 +70,8 @@ public class CouponUser extends BaseEntity {
 		corp_bulk_task("corp_bulk_task", "企业微信群发任务"),
 		channel_popularize("channel_popularize", "渠道推广"),
 		new_welfare("new_welfare", "新人福利"),
+		corp_active_code("corp_active_code", "企业微信活码"),
+		customer_link("customer_link", "获客链接")
 		;
 		private String channel;
 		private String desc;

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

@@ -0,0 +1,18 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: DistributeGoodsSkuAlert
+ * 创建者: JavaZou
+ * 创建时间:2023/11/8 14:08
+ */
+@Getter
+@Setter
+public class DistributeGoodsSkuAlert extends BaseEntity {
+	private Long goodsId;
+
+	private Long skuId;
+}

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

@@ -52,6 +52,11 @@ public class DistributeWaitingSendPoints extends BaseEntity{
 	 */
 	private Boolean isRule;
 
+	/**
+	 * 平摊积分
+	 */
+	private BigDecimal deductPoints;
+
 	/**
 	 * 获取提成比例
 	 */

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

@@ -17,8 +17,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "goods_don",
-		where = ":condition:")
+@SearchBean(tables = "goods_don g",
+        where = ":condition:")
 public class GoodsDon extends BaseEntity {
 
 
@@ -74,7 +74,11 @@ public class GoodsDon extends BaseEntity {
      * 分类
      * 1、AI  2、流媒体
      */
-    private Integer category;
+    private Long category;
+
+    @DbIgnore
+    @TableField(exist = false)
+    private List<Long> categoryList;
 
     /**
      * 二级分类
@@ -84,6 +88,22 @@ public class GoodsDon extends BaseEntity {
 
     private String banner;
 
+    /**
+     * 商品搭配图
+     */
+    private String matchImg;
+
+
+    /**
+     * 是否贴片 false
+     */
+    private Boolean isPatch;
+
+    /**
+     * H5标签
+     */
+    private String mobileTags;
+
     /**
      * 平台分销比例
      */
@@ -189,6 +209,11 @@ public class GoodsDon extends BaseEntity {
      */
     private Boolean isDistribute;
 
+    /**
+     * 是否开启规格分销 默认未开启
+     */
+    private Boolean isSkuDistribute;
+
     @AllArgsConstructor
     @Getter
     public enum SpecialType {

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

@@ -0,0 +1,20 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsDonCategoryRelate
+ * 创建者: JavaZou
+ * 创建时间:2023/10/7 18:14
+ */
+@Getter
+@Setter
+public class GoodsDonCategoryRelate extends BaseEntity{
+	private Long goodsId;
+
+	private Long category;
+
+	private Integer sorted;
+}

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

@@ -20,7 +20,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "goods_don_sku")
+@SearchBean(tables = "goods_don_sku",
+		where = ":condition:")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class GoodsDonSku extends BaseEntity {
 
@@ -54,6 +55,26 @@ public class GoodsDonSku extends BaseEntity {
      */
     private String notifyText;
 
+    /**
+     * H5标签
+     */
+    private String mobileTags;
+
+    /**
+     * 规格背景图
+     */
+    private String img;
+
+    /**
+     * 规格框提示
+     */
+    private String smallMsg;
+
+    /**
+     * 双重验证码次数
+     */
+    private Integer codeNum;
+
     /**
      * 商品预览图
      */

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

@@ -33,4 +33,8 @@ public class GoodsDonStock extends BaseEntity {
     @TableField(exist = false)
     private List<GoodsSkuStockRelate> relateList;
 
+    @DbIgnore
+    @TableField(exist = false)
+    private String operator;
+
 }

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

@@ -16,13 +16,17 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "goods_don_stock s, goods_don_stock_record r ",
-            where = "s.id = r.stock_id "
+            where = "s.id = r.stock_id and r.is_undo is false"
 )
 public class GoodsDonStockRecord extends BaseEntity{
 
     @DbField("s.id")
     private Long stockId;
 
+    @DbField("r.id")
+    @TableField(exist = false)
+    private Long recordId;
+
     @DbField("s.title")
     @TableField(exist = false)
     private String title;
@@ -61,4 +65,10 @@ public class GoodsDonStockRecord extends BaseEntity{
     @DbField("r.created_time")
     @TableField(exist = false)
     private Date recordCreatedTime;
+
+    /**
+     * 是否撤销 默认否
+     */
+    @DbField("r.is_undo")
+    private Boolean isUndo;
 }

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

@@ -21,4 +21,6 @@ public class GoodsSkuStockRelate extends BaseEntity{
 
     private String skuTitle;
 
+    private String skuJson;
+
 }

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

@@ -0,0 +1,39 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsSkuStockRelateChangeRecord
+ * 创建者: JavaZou
+ * 创建时间:2023/11/2 17:32
+ */
+@Getter
+@Setter
+public class GoodsSkuStockRelateChangeRecord extends BaseEntity{
+	private Long stockId;
+
+	private Long goodsId;
+
+	private String goodsTitle;
+
+	private Long skuId;
+
+	private String skuTitle;
+
+	/**
+	 * 统一记录id
+	 */
+	private Long uniformId;
+
+	/**
+	 * 统一记录id
+	 */
+	private String type;
+
+	/**
+	 * 操作人
+	 */
+	private String operator;
+}

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

@@ -0,0 +1,10 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class GptTicketStandby extends BaseEntity{
+    private Long userId;
+}

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

@@ -89,6 +89,21 @@ public class GroupsRelation extends BaseEntity {
     private Long newRelationId;
 
 
+    /**
+     * 车队目前可用停车数
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private Integer groupsAvailParkingNum;
+
+    /**
+     * 车队最多可用车位数
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private Integer maxNum;
+
+
     @AllArgsConstructor
     @Getter
     public enum Status{

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

@@ -0,0 +1,45 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GroupsRelationAlert
+ * 创建者: JavaZou
+ * 创建时间:2023/10/26 15:13
+ */
+@Getter
+@Setter
+public class GroupsRelationAlert extends BaseEntity{
+
+	/**
+	 * 针对库存
+	 */
+	@NotNull
+	private Long skuId;
+
+	/**
+	 * 预警数量
+	 */
+	@NotNull(message = "预警数量不为空")
+	private Integer num;
+
+	/**
+	 * 手机号
+	 */
+	@NotNull(message = "手机号不为空")
+	private String phoneStr;
+
+	/**
+	 * 预警开发
+	 */
+	private Boolean isOpen;
+
+	/**
+	 * 是否重置 根据新增对应规格账号 重置该预警记录
+	 */
+	private Boolean isReset;
+}

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

@@ -1,6 +1,8 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.cyksj.model.BaseEntity;
+import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
@@ -78,6 +80,8 @@ public class GroupsRelationExpiryRecord extends BaseEntity {
 	 */
 	private String customerService;
 
+	private String followId;
+
 	/**
 	 * 是否跟进
 	 */
@@ -88,4 +92,12 @@ public class GroupsRelationExpiryRecord extends BaseEntity {
 	 * 0已到期
 	 */
 	private Integer accountStatus;
+
+	@DbIgnore
+	@TableField(exist = false)
+	private String corpUserName;
+
+	@DbIgnore
+	@TableField(exist = false)
+	private String corpHeadImgUrl;
 }

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

@@ -0,0 +1,24 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GroupsRelationIndependentRenew
+ * 创建者: JavaZou
+ * 创建时间:2023/11/27 15:26
+ */
+@Getter
+@Setter
+public class GroupsRelationIndependentRenew extends BaseEntity{
+	private Long userId;
+
+	private Long relationId;
+
+	private Boolean isRenew;
+
+	private String operator;
+
+	private Long orderId;
+}

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

@@ -0,0 +1,24 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GroupsRelationLoginCodeRecord
+ * 创建者: JavaZou
+ * 创建时间:2023/12/4 11:06
+ */
+@Getter
+@Setter
+public class GroupsRelationLoginCodeRecord extends BaseEntity{
+	private Long userId;
+
+	private Long skuId;
+
+	private Long relationId;
+
+	private Long goodsId;
+
+	private String account;
+}

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

@@ -126,6 +126,25 @@ public class GroupsTrips {
     @TableField(exist = false)
     private Date expiryTime;
 
+    /**
+     * 车队上是否有人
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private Boolean isExists;
+
+    /**
+     * 可上车队时间
+     */
+    @DbField("gt.parking_time")
+    private Date parkingTime;
+
+    /**
+     * 目前可停车数目
+     */
+    @DbField("gt.available_parking_num")
+    private Integer availableParkingNum;
+
     /**
      * 创建时间
      */

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

@@ -1,5 +1,7 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -28,6 +30,18 @@ public class HomeManagementConfig extends BaseEntity{
 
 	private Boolean status;
 
+	/**
+	 * 定时上下架状态 默认null
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Boolean preStatus;
+
+	/**
+	 * 定时上下架时间
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long time;
+
 	private Boolean deleted;
 
 	private AdType adType;

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

@@ -76,4 +76,16 @@ public class OrderDetailView {
 
 	@DbIgnore
 	private OrderDonTransport transport;
+
+	@DbField("o.relation_id")
+	private Long relationId;
+
+	@DbField("g.logo")
+	private String logo;
+
+	@DbIgnore
+	private String account;
+
+	@DbIgnore
+	private String password;
 }

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

@@ -39,6 +39,11 @@ public class OrderDon extends BaseEntity implements Serializable {
 
     private Long goodsId;
 
+    /**
+     * 买家支付id
+     */
+    private String buyerId;
+
     /**
      * 微信订单号
      */
@@ -54,7 +59,23 @@ public class OrderDon extends BaseEntity implements Serializable {
     private String openId;
 
     /** 金额 */
-    private BigDecimal money ;
+    private BigDecimal money;
+
+    /**
+     * 加购商品金额
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private BigDecimal dpMoney;
+
+    /**
+     * 主平台订单金额
+     */
+    private BigDecimal oriMoney;
+
+    @DbIgnore
+    @TableField(exist = false)
+    private BigDecimal dsMoney;
 
     /**
      * 海外支付金额
@@ -226,12 +247,14 @@ public class OrderDon extends BaseEntity implements Serializable {
      * 付款说明
      */
     @TableField(exist = false)
+    @DbIgnore
     private String payDesc;
 
     /**
      * 虚拟平台特殊类型
      */
     @TableField(exist = false)
+    @DbIgnore
     private GoodsDon.SpecialType specialType;
 
     /**
@@ -259,6 +282,15 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private Long yhsId;
 
+    /**
+     * 下单手机号
+     */
+    private String phone;
+
+    private String ip;
+
+    private String location;
+
     public enum Status {
         /**
          * 订单状态

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

@@ -68,7 +68,17 @@ public class OrderDonPost extends BaseEntity implements Serializable {
         /**
          * 360点睛
          */
-        DJ("360点睛", "dj","ORDER")
+        DJ("360点睛", "dj","ORDER"),
+
+        /**
+         * 百度
+         */
+        BaiDu("百度回传", "BaiDu", "3"),
+
+        /**
+         * oceanengine回传
+         */
+        OE("巨量回传","OE","active_pay"),
 
         ;
 

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

@@ -52,4 +52,10 @@ public class RefundOrderDon extends BaseEntity{
 	 * 退款方式
 	 */
 	private String refundMethod;
+
+	/**
+	 * 是否清空余额退款
+	 * 默认false
+	 */
+	private Boolean isClearBalance;
 }

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

@@ -0,0 +1,22 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: SysConfigChangeRecord
+ * 创建者: JavaZou
+ * 创建时间:2023/11/24 10:42
+ */
+@Getter
+@Setter
+public class SysConfigChangeRecord extends BaseEntity{
+	private String sysKey;
+
+	private String preValue;
+
+	private String backValue;
+
+	private String operator;
+}

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

@@ -0,0 +1,26 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: SysEmail
+ * 创建者: JavaZou
+ * 创建时间:2023/11/14 16:18
+ */
+@Getter
+@Setter
+public class SysEmail extends BaseEntity{
+	@NotEmpty
+	private String email;
+
+	@NotEmpty
+	private String password;
+
+	@TableLogic(value = "1", delval = "0")
+	private Boolean deleted;
+}

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

@@ -0,0 +1,44 @@
+package com.cyksj.model.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: SysFuncTimingShelf
+ * 创建者: JavaZou
+ * 创建时间:2023/12/28 10:25
+ */
+@Getter
+@Setter
+public class SysFuncTimingShelf extends BaseEntity {
+
+	private String type;
+
+	private Long funcId;
+
+	/**
+	 * 定时上下架状态
+	 */
+	private Boolean preStatus;
+
+	/**
+	 * 定时上下架时间
+	 */
+	private Long time;
+
+	private String timeStr;
+
+	private Boolean deleted;
+
+
+	@Getter
+	@AllArgsConstructor
+	public enum Type {
+		hc("首页配置"),
+		;
+		String desc;
+	}
+
+}

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

@@ -30,8 +30,10 @@ public class UserBalanceSourceRecord extends BaseEntity{
 		ds_transport("分销实物发货"),
 		follow_task("关注引导"),
 		rd_comment("实物评论"),
-		price_differ("订单补差价")
-		;
+		price_differ("订单补差价"),
+		compensate("补偿"),
+		manual("手动扣除")
+				;
 		String desc;
 
 		Source(String desc) {