Merge branch 'master' into home_page_func

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/entity/GoodsDonSku.java
#	netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonCategoryFrontView.java
#	netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSkuFrontView.java
#	netflix-dao/src/main/java/com/cyksj/model/views/GoodsFrontListView.java
#	netflix-dao/src/main/java/com/cyksj/model/views/GoodsHomePageView.java
#	netflix-dao/src/main/java/com/cyksj/model/views/HomeManagementFrontView.java
#	netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java
#	netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonController.java

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

@@ -26,6 +26,12 @@ public interface Constant {
 	 */
 	List<Integer> realGoodsType = List.of(2, 3);
 
+	/**
+	 * 平台类型
+	 * 1、虚拟、2实物、3潮玩好物
+	 */
+	List<Integer> goodsType = List.of(1, 2, 3);
+
 	/**
 	 * 默认头像
 	 */
@@ -106,6 +112,8 @@ public interface Constant {
 
 	String ACCOUNT_EXPIRY_MSG_TEMPLATE = "您好，您购买的%s，还有%s到期，请登陆网站https://nf.video/及时续费。【银河录像局】";
 
+	String ONE_EMPTY = " ";
+
 	String AMERICA_APPID_SECRET = "1990-01-01 朋友 aaa111 工作 aab112 父母 aac113";
 
 	String ACCOUNT_DOUBLE_VERIFY_KEY = "account_double_verify_key";
@@ -151,4 +159,38 @@ public interface Constant {
 	 * GPT 平台账号重复
 	 */
 	List<Long> GPT_GOODS_IDS = List.of(18l, 29l, 30l);
+
+	List<String> TRACK_RENEW_TYPE = List.of("email", "wechat");
+
+	String ORDER_MSG_FIRST_NOTIFY = "%s购买成功，收藏官网https://nf.video/ 合租账号就上银河录像局【银河录像局】";
+
+	String LOGIN_CODE = "yhc@36";
+
+	//PS AI,POE会员
+	List<Long> DOWN_GOODS_PAY = List.of(33l, 35l);
+
+	/**
+	 * 人民币符号
+	 */
+	String CN_CYS = "¥";
+
+	String DY_CS_CODE_KEY = "抖音免费设备";
+
+	List<String> DY_CUS = List.of("QiuDaoYuBuGuoQi.", "YinHeLuXiangJuSheBeiShouQian");
+
+	/**
+	 * 渠道分销规则key
+	 */
+	String DISTRIBUTE_RULE_KEY = "distribute_rule_key";
+
+	String ZERO_STR = "0";
+
+	String ONE_STR = "1";
+
+	/**
+	 * 渠道规格过滤平台key
+	 */
+	String DISTRIBUTE_RULE_FILTER_GOODS_KEY = "distribute_rule_filter_goods_key";
+
+	String USER_OPEN_SHOP_DS_ORDERS_LIMIT_KEY = "user_open_shop_ds_orders_limit_key";
 }

netflix-common/src/main/java/com/cyksj/dto/RedisKey.java

@@ -56,4 +56,8 @@ public class RedisKey {
 
     public static String DISABLE_ACCOUNT_ASSIGN = "disable_account_assign:";
 
+    /**
+     * Telegram 电报机器人推送
+     */
+    public static String TELEGRAM_BOT_MSG ="telegram:bot:msg";
 }

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GiftCardUserRecord;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.math.BigDecimal;
+
+/*
+ *项目名: netflix
+ *文件名: GiftCardUserRecordMapper
+ *创建者: JavaZou
+ *创建时间:2023/8/28 12:01
+ */
+public interface GiftCardUserRecordMapper extends BaseMapper<GiftCardUserRecord> {
+	@Update("update gift_card_user_record set remain_cash = remain_cash + #{addCash},is_used = 0 where id = #{gcId} and remain_cash = #{remainCash}")
+	Integer updateGiftCardRemainCash(@Param("gcId") Long gcId, @Param("addCash") BigDecimal addCash, @Param("remainCash") BigDecimal remainCash);
+}

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

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

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

@@ -27,4 +27,7 @@ public interface GoodsDonMapper extends BaseMapper<GoodsDon> {
 	@Select("select sku.id as skuId,sku.goods_id,sku.spec_val,g.title as goodsTitle from goods_don_sku sku inner join goods_don g on g.id = sku.goods_id" +
 			" where g.deleted is true and type = #{type}")
 	List<GoodsDonSkuView> selectGoodsDonSkuByGoodsType(Integer type);
+
+	@Select("select g.id, g.title from (select distinct goods_id from order_don where status not in ('close','noPayment') and yhs_id = #{yhsId}) o inner join goods_don g on g.id = o.goods_id and g.type = 1")
+	List<GoodsDon> getYhShopDistributeGoodsDetail(Long yhsId);
 }

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

@@ -2,6 +2,7 @@ package com.cyksj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.GoodsDonSku;
+import com.cyksj.model.entity.YhShopGoodsSku;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -13,4 +14,10 @@ import java.util.List;
 public interface GoodsDonSkuMapper  extends BaseMapper<GoodsDonSku> {
 
 	List<Long> selectAIMonthSkuIds(@Param("list") List<Long> goodsIds);
+
+	List<Long> getSpecificSkuIdsByGoodsIds(@Param("list") List<Long> aiGoodsIds, @Param("months") Integer months);
+
+	List<Long> getSpecificSkuIdsByGoodsId(@Param("goodsId") Long goodsId, @Param("num") Integer num, @Param("months") Integer months);
+
+	List<YhShopGoodsSku> selectSkuShops(@Param("list") List<Long> goodsIds);
 }

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

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

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

@@ -0,0 +1,14 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GroupsRelationExpiryRecord;
+
+/*
+ *项目名: netflix-job
+ *文件名: GroupsRelationExpiryRecordMapper
+ *创建者: JavaZou
+ *创建时间:2023/9/4 17:07
+ */
+public interface GroupsRelationExpiryRecordMapper extends BaseMapper<GroupsRelationExpiryRecord> {
+
+}

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

@@ -30,7 +30,7 @@ public interface GroupsRelationMapper extends BaseMapper<GroupsRelation> {
 
 	Long selectSimilarExpiredRelation(@Param("skuId") Long skuId, @Param("minExpiryTime") DateTime minExpiryTime);
 
-	List<GroupsRelationView> selectRelationByGoodsId(@Param("goodsId") Long goodsId, @Param("userId") Long userId);
+	List<GroupsRelationView> selectRelationByGoodsId(@Param("goodsId") Long goodsId, @Param("userId") Long userId, @Param("yhsId") Long yhsId);
 
 	GroupsRelationView getGroupRelationViewByUserIdAndRelationId(@Param("userId") Long userId, @Param("relationId") Long relationId);
 
@@ -51,4 +51,6 @@ public interface GroupsRelationMapper extends BaseMapper<GroupsRelation> {
 	List<Long> getTicketGoodsId(@Param("list") List<Long> userIds, @Param("status") List<String> status);
 
 	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);
 }

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

@@ -2,6 +2,9 @@ package com.cyksj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.OrderDiscountPlusPurchaseSkuRelation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /*
  *项目名: netflix
@@ -10,4 +13,5 @@ import com.cyksj.model.entity.OrderDiscountPlusPurchaseSkuRelation;
  *创建时间:2023/7/21 9:56
  */
 public interface OrderDiscountPlusPurchaseSkuRelationMapper extends BaseMapper<OrderDiscountPlusPurchaseSkuRelation> {
+	List<OrderDiscountPlusPurchaseSkuRelation> selectPlusRelationByIdAndUserId(@Param("relationId") Long relationId, @Param("userId") Long userId);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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;
@@ -47,4 +48,10 @@ public interface OrderDonMapper extends BaseMapper<OrderDon> {
 	BigDecimal selectThisMonthDistributeOrderMoney(@Param("skuIds") Set<Long> skuIds, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
 	Map<String, Object> getOrderDetailByGoodsType(@Param("type") Integer type, @Param("noOrderStatus") List<String> noOrderStatus, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+	BackgroundDataView getBackgroundDataView(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("noOrderStatus") List<String> noOrderStatus);
+
+	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);
 }

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

@@ -50,4 +50,16 @@ public interface UserMapper extends BaseMapper<User> {
 
     @Select("select id from user where show_id = #{showId} limit 1")
     Long getUserIdByShowId(String showId);
+
+    @Select("select cast(ifnull(sum(balance),0)/100 as decimal(11,2)) from user")
+	BigDecimal statisticsRemainBalance();
+
+    @Update("update user set yhs_money = yhs_money + #{addYhsMoney} where id = #{userId} and yhs_money = #{yhsMoney}")
+    Integer addYhsMoney(@Param("userId") Long id, @Param("yhsMoney") BigDecimal yhsMoney, @Param("addYhsMoney") BigDecimal addYhsMoney);
+
+    @Update("update user set yhs_money = yhs_money - #{deductMoney} where id = #{shopUserId} and yhs_money = #{yhsMoney}")
+    Integer subYhShopUserMoney(@Param("shopUserId") Long shopUserId, @Param("yhsMoney") BigDecimal yhsMoney, @Param("deductMoney") BigDecimal deductMoney);
+
+    @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);
 }

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

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

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

@@ -7,6 +7,8 @@ import com.cyksj.model.views.CorpTagBackView;
 import com.cyksj.model.views.CorpTagGroupView;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 /*
  *项目名: netflix
  *文件名: CorpTagGroupMapper
@@ -19,4 +21,6 @@ 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);
+
+	CorpTagBackView fillCorpGroupTagInfo(@Param("groupId") String groupId, @Param("wxCorpId") Long wxCorpI);
 }

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

@@ -23,4 +23,6 @@ public interface CorpTagMapper extends BaseMapper<CorpTag> {
 	CorpTag getCorpTagById(Long corpTagId);
 
 	CorpTagHeadDataView getCorpTagHeadDataView();
+
+	Integer selectCountOfCustomer(@Param("tagId") String tagId, @Param("wxCorpId") Long wxCorpId);
 }

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

@@ -16,4 +16,6 @@ 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> selectCorpUserFollowRelation(@Param("wxCorpId") Long wxCorpId, @Param("followIds") List<String> service_follow_ids);
 }

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

@@ -1,7 +1,10 @@
 package com.cyksj.mapper.manage.coupon;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.Coupon;
 import com.cyksj.model.entity.CouponDistributePopularize;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 /*
@@ -13,4 +16,7 @@ import org.apache.ibatis.annotations.Update;
 public interface CouponDistributePopularizeMapper extends BaseMapper<CouponDistributePopularize> {
 	@Update("update coupon_distribute_popularize set deleted = false where coupon_id = #{id}")
 	void deleteByCouponId(Long id);
+
+	@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);
 }

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

@@ -23,5 +23,5 @@ public interface CouponRecommendMapper extends BaseMapper<CouponRecommend> {
 
 	List<CouponAvailableRecommendView> getRecommendCouponList(@Param("userId") Long userId, @Param("isNewUser") Boolean isNewUser);
 
-	Page<CouponRecommendView> getRecommendCouponViewList(@Param("userId") Long userId, @Param("isNewUser") Boolean isNewUser, @Param("page") IPage<CouponRecommendView> page);
+	Page<CouponRecommendView> getRecommendCouponViewList(@Param("userId") Long userId, @Param("isNewUser") Boolean isNewUser, @Param("page") IPage<CouponRecommendView> page, @Param("couponId") Long couponId);
 }

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

@@ -24,7 +24,9 @@ public interface CouponUserMapper extends BaseMapper<CouponUser> {
 
 	Page<CouponActiveView> couponCenterList(@Param("userId") Long userId, IPage<CouponUserView> page);
 
-	Page<CouponUserView> couponPersonalList(@Param("userId") Long userId, @Param("page") Page<CouponUserView> page);
+	Page<CouponUserView> couponPersonalList(@Param("userId") Long userId, @Param("page") Page<CouponUserView> page, @Param("couponId") Long couponId);
 
 	CouponUserView getNewUserWelfareCouponsByUserId(@Param("userId") long userId, @Param("channel") CouponUser.Channel channel, @Param("now") DateTime now);
+
+	CouponUser getCouponByCouponUserId(Long couponUserId);
 }

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

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

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /*
@@ -65,4 +66,6 @@ public interface StatisticsExportMapper{
 	ExcelAppleOneData getAppleOneDataThisMonth(@Param("skuIds") Set<Long> skuIds, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
 	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);
 }

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+package com.cyksj.mapper.shop;
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.YhShopDistributeWaitingSendPoints;
+import com.cyksj.model.views.YhShopBrokenLineCpsUserWMoneyView;
+import com.cyksj.model.views.YhShopUserWMoneyStatisticsDataView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopDistributeWaitingSendPointsMapper
+ *创建者: JavaZou
+ *创建时间:2023/9/19 18:08
+ */
+public interface YhShopDistributeWaitingSendPointsMapper extends BaseMapper<YhShopDistributeWaitingSendPoints> {
+	YhShopBrokenLineCpsUserWMoneyView getWMoneyStatisticsDataView(@Param("yhShopUserId") long yhShopUserId, @Param("first") DateTime first, @Param("end") DateTime end, @Param("today") Boolean today);
+
+	List<YhShopUserWMoneyStatisticsDataView> getWMoneyStatisticsDate(@Param("yhShopUserId") long yhShopUserId, @Param("first") DateTime first, @Param("end") DateTime end, @Param("today") Boolean today);
+}

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

@@ -0,0 +1,13 @@
+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/YhShopGoodsRateMapper.java

@@ -0,0 +1,11 @@
+package com.cyksj.mapper.shop;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.YhShopGoodsRate;
+
+/**
+ * @author zwhui
+ * @date 2023/9/14 16:45
+ */
+public interface YhShopGoodsRateMapper extends BaseMapper<YhShopGoodsRate> {
+}

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

@@ -0,0 +1,18 @@
+package com.cyksj.mapper.shop;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GoodsDonSku;
+import com.cyksj.model.entity.YhShopGoodsSku;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * @author zwhui
+ * @date 2023/9/14 17:43
+ */
+public interface YhShopGoodsSkuMapper extends BaseMapper<YhShopGoodsSku> {
+
+	@Select("select sku.*,ygs.price as yhShopSkuPrice from (select user_id from yh_shop where id = #{yhsId} limit 1) ys inner join yh_shop_goods_sku ygs on ygs.user_id = ys.user_id and ygs.sku_id = #{skuId} and ygs.deleted is true and ygs.status is true" +
+			" inner join goods_don_sku sku on sku.id = ygs.sku_id")
+	GoodsDonSku selectGoodsDonSkuBySkuIdAndYhsId(@Param("yhsId") Long yhsId, @Param("skuId") Long skuId);
+}

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

@@ -0,0 +1,31 @@
+package com.cyksj.mapper.shop;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.YhShop;
+import com.cyksj.model.entity.YhShopDistributeMoneyApply;
+import com.cyksj.model.views.YhShopDistributeView;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopMapper
+ *创建者: JavaZou
+ *创建时间:2023/9/14 16:58
+ */
+public interface YhShopMapper extends BaseMapper<YhShop> {
+	String selectSoldMaxGoods(Long userId);
+
+	YhShopDistributeView getApplyDetailByUserId(Long userId);
+
+	Map<String, Object> selectYhShopDetail(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+	BigDecimal selectYhShopTakeMoney(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+	Map<String, Object> selectYhShopApplyMoney(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+	YhShopDistributeMoneyApply selectRelationBusiness(Long userId);
+}

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

@@ -0,0 +1,13 @@
+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/YhShopUserDistributeBusinessOrderDonRecordMapper.java

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

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

@@ -0,0 +1,13 @@
+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/shop/YhShopUserDistributeSharedMapper.java

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

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

@@ -0,0 +1,14 @@
+package com.cyksj.mapper.shop;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.YhShopUserPlatDistributeRate;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopUserPlatDistributeRateMapper
+ *创建者: JavaZou
+ *创建时间:2023/9/18 14:26
+ */
+public interface YhShopUserPlatDistributeRateMapper extends BaseMapper<YhShopUserPlatDistributeRate> {
+	void batchInsertGoodsRate(Long userId);
+}

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

@@ -62,4 +62,14 @@ public class AuthRedirect {
      * 绑定邮箱
      */
     private String le;
+
+    /**
+     * appid
+     */
+    private String ap;
+
+    /**
+     * 店铺自定义id
+     */
+    private String cd;
 }

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

@@ -0,0 +1,38 @@
+package com.cyksj.model.dto;
+
+import com.cyksj.model.entity.YhShop;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopInfo
+ *创建者: JavaZou
+ *创建时间:2023/9/20 14:26
+ */
+@Getter
+@Setter
+@SearchBean(tables = "yh_shop ys",
+		where = ":uid:")
+public class YhShopInfo {
+	@DbField("ys.id")
+	private Long yhsId;
+
+	private String customId;
+
+	private String name;
+
+	private YhShop.Status verifyStatus;
+
+	private Boolean status;
+
+	private String contact;
+
+	private String reason;
+
+	private Date createdTime;
+}

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

@@ -23,4 +23,6 @@ public class CorpFollowConfig extends BaseEntity{
 	private String configId;
 
 	private String qrCode;
+
+	private String remark;
 }

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

@@ -3,6 +3,7 @@ package com.cyksj.model.entity;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /*
@@ -41,6 +42,11 @@ public class CouponUser extends BaseEntity {
 	 */
 	private Channel channel;
 
+	/**
+	 * 折扣卷折扣 用于分销
+	 */
+	private BigDecimal discount;
+
 	/**
 	 * 优惠券使用状态
 	 */

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

@@ -46,6 +46,17 @@ public class DistributeWaitingSendPoints extends BaseEntity{
 	 */
 	private Boolean isDelivery;
 
+	/**
+	 * 分销提成平摊折扣金额
+	 * 是否参与渠道分销规则
+	 */
+	private Boolean isRule;
+
+	/**
+	 * 获取提成比例
+	 */
+	private Integer rate;
+
 	@Getter
 	public enum Status{
 		close("分销订单关闭,积分奖励不分发"),

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

@@ -0,0 +1,24 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EmailConfig extends BaseEntity{
+	private String host;
+
+	private Integer port;
+
+	private String protocol;
+
+	private String username;
+
+	private String password;
+
+	private String defaultEncoding;
+
+	private String source;
+
+	private Integer type;
+}

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

@@ -0,0 +1,48 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/*
+ *项目名: netflix
+ *文件名: GiftCardGoodsSku
+ *创建者: JavaZou
+ *创建时间:2023/8/28 16:34
+ */
+@Getter
+@Setter
+public class GiftCardGoodsSku extends BaseEntity{
+	private Long goodsId;
+
+	/**
+	 * 礼品卡类型 1现金卡、2虚拟卡
+	 */
+	private Integer gcType;
+
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long gcGoodsId;
+
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long gcSkuId;
+
+	/**
+	 * 现金
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private BigDecimal cash;
+
+	/**
+	 * 对应价格
+	 */
+	private BigDecimal price;
+
+	private String logo;
+
+	private Boolean status;
+
+	private Boolean deleted;
+}

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

@@ -0,0 +1,20 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: yhlxj
+ *文件名: GiftCardOrderRelate
+ *创建者: JavaZou
+ *创建时间:2023/9/14 16:14
+ */
+@Getter
+@Setter
+public class GiftCardOrderRelate extends BaseEntity{
+	private Long orderId;
+
+	private String gcPayDetail;
+
+	private Boolean isPay;
+}

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

@@ -0,0 +1,35 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/*
+ *项目名: netflix
+ *文件名: GiftCardOrderUseRecord
+ *创建者: JavaZou
+ *创建时间:2023/8/29 16:12
+ */
+@Getter
+@Setter
+public class GiftCardOrderUseRecord extends BaseEntity{
+	private Long orderId;
+
+	private Long userId;
+
+	/**
+	 * 礼品卡id
+	 */
+	private Long gcId;
+
+	/**
+	 * 使用礼品卡现金数量
+	 */
+	private BigDecimal cash;
+
+	/**
+	 * 默认已使用
+	 */
+	private Boolean isUsed;
+}

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

@@ -0,0 +1,77 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/*
+ *项目名: netflix
+ *文件名: GiftCardUserRecord
+ *创建者: JavaZou
+ *创建时间:2023/8/25 18:16
+ */
+@Getter
+@Setter
+public class GiftCardUserRecord extends BaseEntity{
+	private Long userId;
+
+	private Long orderId;
+
+	/**
+	 * 礼品卡类型
+	 */
+	private Integer gcType;
+
+	/**
+	 * 礼品卡明细
+	 */
+	private String gcDetail;
+
+	private Long gcGoodsId;
+
+	private Long gcSkuId;
+
+	private BigDecimal cash;
+
+	private BigDecimal remainCash;
+
+	private Long toUserId;
+
+	private Boolean isSend;
+
+	/**
+	 * 领取时间
+	 */
+	private Date receivedTime;
+
+	private Date payTime;
+
+	/**
+	 * 是否已购买
+	 */
+	private Boolean isPay;
+
+	/**
+	 * 礼品卡兑换随机码
+	 */
+	private String rc;
+
+	private Boolean isUsed;
+
+	/**
+	 * 礼品卡赠送类型
+	 */
+	private String type;
+
+	/**
+	 * 背景图
+	 */
+	private String img;
+
+	/**
+	 * 座位id
+	 */
+	private Long relationId;
+}

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

@@ -0,0 +1,35 @@
+package com.cyksj.model.entity;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: goods_courseware_file
+ *创建者: JavaZou
+ *创建时间:2023/8/24 10:51
+ */
+@Getter
+@Setter
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class GoodsCoursewareFile extends BaseEntity{
+	private Long goodsId;
+
+	/**
+	 * 邮箱标题
+	 */
+	private String subject;
+
+	private String fileName;
+
+	private String path;
+
+	private String img;
+
+	private String link;
+
+	private String code;
+
+	private Boolean status;
+}

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

@@ -17,7 +17,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "goods_don")
+@SearchBean(tables = "goods_don",
+		where = ":condition:")
 public class GoodsDon extends BaseEntity {
 
 
@@ -178,10 +179,17 @@ public class GoodsDon extends BaseEntity {
     @DbIgnore
     private Integer accountCount;
 
+    /**
+     * 是否是特定价格 规格平台
+     */
+    private Boolean isSp;
+
     @AllArgsConstructor
     @Getter
     public enum SpecialType {
         recharge("代充"),
+        courseware("课程"),
+        giftCard("礼品卡")
         ;
 
         private String desc;

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

@@ -124,13 +124,6 @@ public class GoodsDonSku extends BaseEntity {
      */
     private Boolean isDp;
 
-    /**
-     * 优惠加购商品规格展示
-     */
-    @DbIgnore
-    @TableField(exist = false)
-    private List<GoodsDiscountPlusPurchaseRelationFrontView> dpSkuList;
-
     /**
      * 特定价格
      */
@@ -141,6 +134,13 @@ public class GoodsDonSku extends BaseEntity {
      */
     private String specificGoodsIds;
 
+    /**
+     * 优惠加购商品规格展示
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private List<GoodsDiscountPlusPurchaseRelationFrontView> dpSkuList;
+
     /**
      * 前端展示
      */
@@ -156,4 +156,8 @@ public class GoodsDonSku extends BaseEntity {
     @TableField(exist = false)
     @JsonProperty("sname")
     private String sName;
+
+    @DbIgnore
+    @TableField(exist = false)
+    private BigDecimal yhShopSkuPrice;
 }

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

@@ -21,7 +21,7 @@ public class GoodsDonSpec extends BaseEntity {
     /**
      * 规格属性值最大id
      */
-    private Long maxId;
+    private Integer maxId;
 
     /**
      * 商品规格数量

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

@@ -72,6 +72,8 @@ public class GroupsRelation extends BaseEntity {
      */
     private String verifyCode;
 
+    private Long yhsId;
+
     /**
      * 获取权益时的订单id
      */

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

@@ -0,0 +1,25 @@
+package com.cyksj.model.entity;
+
+import com.cyksj.model.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix-job
+ *文件名: GroupsRelationCustomerServiceFollowRecord
+ *创建者: JavaZou
+ *创建时间:2023/9/4 17:08
+ */
+@Getter
+@Setter
+public class GroupsRelationCustomerServiceFollowRecord extends BaseEntity {
+	/**
+	 * group_relation_expiry_record
+	 * 用户车票跟进记录id
+	 */
+	private Long ecId;
+
+	private String content;
+
+	private String imgs;
+}

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

@@ -0,0 +1,91 @@
+package com.cyksj.model.entity;
+
+import com.cyksj.model.BaseEntity;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/*
+ *项目名: netflix-job
+ *文件名: GroupsRelationExpiryRecord
+ *创建者: JavaZou
+ *创建时间:2023/9/4 16:48
+ */
+@Getter
+@Setter
+@SearchBean(tables = "groups_relation_expiry_record")
+public class GroupsRelationExpiryRecord extends BaseEntity {
+	private Long userId;
+
+	private String nickname;
+
+	/**
+	 * 注册方式
+	 */
+	private String registerEnv;
+
+	private String register;
+
+	/**
+	 * 联系方式
+	 */
+	private String contact;
+
+	/**
+	 * 是否加入了企业微信
+	 */
+	private Boolean isJoinCorpWx;
+
+	private Long goodsId;
+
+	private String goodsTitle;
+
+	private Long relationId;
+
+	private Date startTime;
+
+	private Date expiryTime;
+
+	private Long skuId;
+
+	private String specVal;
+
+	private Boolean isReBuy;
+
+	private Long reBuyOrderId;
+
+	private Date reBuyTime;
+
+	private Long reBuyGoodsId;
+
+	private String reBuyGoodsTitle;
+
+	private Long reBuySkuId;
+
+	private String reBuySpecVal;
+
+	/**
+	 * 分配时间
+	 */
+	private Date assignTime;
+
+	private Long customerServiceId;
+
+	/**
+	 * 分配客服
+	 */
+	private String customerService;
+
+	/**
+	 * 是否跟进
+	 */
+	private Boolean isFollow;
+
+	/**
+	 * 到期状态
+	 * 0已到期
+	 */
+	private Integer accountStatus;
+}

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

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @SearchBean(tables = "order_don o left join goods_don_sku sku on o.sku_id = sku.id " +
-		"left join goods_don g on g.id = sku.goods_id ")
+		"left join goods_don g on g.id = o.goods_id ")
 public class OrderDetailView {
 	/**
 	 * 订单id
@@ -62,6 +62,9 @@ public class OrderDetailView {
 	@DbField("o.num")
 	private Integer num;
 
+	@DbField("o.pay_title")
+	private String payTitle;
+
 	@DbIgnore
 	private OrderDonWaybill waybill;
 

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

@@ -14,10 +14,17 @@ import lombok.Setter;
 public class OrderDiscountPlusPurchaseSkuRelation extends BaseEntity{
 	private Long orderId;
 
+	private Long userId;
+
 	/**
 	 * 优惠加购规格id
 	 */
 	private String plusSkuIds;
 
 	private String relationIds;
+
+	/**
+	 * 额外订单ids
+	 */
+	private String plusOrderIds;
 }

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

@@ -2,6 +2,8 @@ package com.cyksj.model.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,6 +12,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author chan
@@ -71,6 +74,11 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private BigDecimal refundBalance;
 
+    /**
+     * 礼品卡现金支付金额
+     */
+    private BigDecimal gcCash;
+
     /**
      * 退款原因
      */
@@ -226,6 +234,24 @@ public class OrderDon extends BaseEntity implements Serializable {
 
     private String payTitle;
 
+    /**
+     * 是否是额外硬塞车票车位的订单
+     */
+    private Boolean isOt;
+
+    /**
+     * 礼品卡现金使用记录
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    @JsonIgnore
+    private List<GiftCardOrderUseRecord> gcUseRecords;
+
+    /**
+     * 店铺id
+     */
+    private Long yhsId;
+
     public enum Status {
         /**
          * 订单状态

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

@@ -65,4 +65,11 @@ public class TransferAccountsRecord extends BaseEntity{
 	 * 转账日期
 	 */
 	private Date transferTime;
+
+	/**
+	 * 渠道类型
+	 * 1分销
+	 * 2店铺提现
+	 */
+	private Integer channelType;
 }

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

@@ -62,6 +62,11 @@ public class User extends BaseEntity implements Serializable{
      */
     private BigDecimal balance;
 
+    /**
+     * 用户店铺提成金额
+     */
+    private BigDecimal yhsMoney;
+
     /**
      * 推广id
      */
@@ -91,6 +96,11 @@ public class User extends BaseEntity implements Serializable{
     @TableField(exist = false)
     private Long phoneUserId;
 
+    /**
+     * 是否是谷歌授权登录
+     */
+    private Boolean isGoogle;
+
     @Getter
     public enum RegisterEnv{
         wx("公众号h5授权登录"),

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

@@ -30,6 +30,7 @@ public class UserBalanceSourceRecord extends BaseEntity{
 		ds_transport("分销实物发货"),
 		follow_task("关注引导"),
 		rd_comment("实物评论"),
+		price_differ("订单补差价")
 		;
 		String desc;
 

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

@@ -0,0 +1,25 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: UserDistributeRuleOrderRecord
+ * 创建者: JavaZou
+ * 创建时间:2023/9/25 14:19
+ */
+@Getter
+@Setter
+public class UserDistributeRuleOrderRecord extends BaseEntity{
+	private Date endTime;
+
+	private Date startTime;
+
+	/**
+	 * 时长
+	 */
+	private String duration;
+}

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

@@ -31,4 +31,11 @@ public class UserDistributeShared extends BaseEntity{
 	 * cps后台自定义推广链接id
 	 */
 	private Long dsPopularizeId;
+
+	/**
+	 * 新渠道上下级规则：
+	 * 在原规则基础上加上用户需在在45天内下单成功之后才算真绑定，享受后续所有订单返利
+	 * 超过45天 未下单 不参与后续提成
+	 */
+	private Boolean isBind;
 }

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

@@ -0,0 +1,18 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: UserPhoneSendRecord
+ *创建者: JavaZou
+ *创建时间:2023/9/7 15:12
+ */
+@Getter
+@Setter
+public class UserPhoneSendRecord extends BaseEntity{
+	private Long orderUserId;
+
+	private String phone;
+}

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

@@ -50,6 +50,11 @@ public class WorkOrder extends BaseEntity{
 
 	private String remark;
 
+	/**
+	 * 店铺主键id
+	 */
+	private Long yhsId;
+
 	@Getter
 	public enum Type {
 		freeze("账号被封"),

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

@@ -0,0 +1,80 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.cyksj.model.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShop
+ *创建者: JavaZou
+ *创建时间:2023/9/14 13:59
+ */
+@Getter
+@Setter
+public class YhShop extends BaseEntity {
+	/**
+	 * 店主id
+	 */
+	private Long userId;
+
+	/**
+	 * 店铺名称
+	 */
+	private String name;
+
+	/**
+	 * 自定义id
+	 */
+	private String customId;
+
+	/**
+	 * 商务id
+	 */
+	private Long businessId;
+
+	private Date businessBindTime;
+
+	/**
+	 * 是否审核通过
+	 */
+	private Status verifyStatus;
+
+	/**
+	 * 店铺开放状态
+	 */
+	private Boolean status;
+
+	/**
+	 * 审核失败原因
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String reason;
+
+	/**
+	 * 联系方式
+	 */
+	private String contact;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	@Getter
+	public enum Status {
+		verify("审核中"),
+		success("审核通过"),
+		fail("审核失败");
+		String desc;
+
+		Status(String desc) {
+			this.desc = desc;
+		}
+	}
+}
+

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

@@ -0,0 +1,59 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopApplyRecord
+ *创建者: JavaZou
+ *创建时间:2023/9/21 10:36
+ */
+@Getter
+@Setter
+public class YhShopApplyRecord extends BaseEntity {
+	/**
+	 * 店主id
+	 */
+	private Long userId;
+
+	/**
+	 * 店铺名称
+	 */
+	private String name;
+
+	/**
+	 * 自定义id
+	 */
+	private String customId;
+
+	/**
+	 * 是否审核通过
+	 */
+	private Status verifyStatus;
+
+	/**
+	 * 审核失败原因
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String reason;
+
+	private Date verifyTime;
+
+	@Getter
+	public enum Status {
+		verify("审核中"),
+		modify("申请修改"),
+		success("审核通过"),
+		fail("审核失败");
+		String desc;
+
+		Status(String desc) {
+			this.desc = desc;
+		}
+	}
+}

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

@@ -0,0 +1,90 @@
+package com.cyksj.model.entity;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopDistributeMoneyApply
+ *创建者: JavaZou
+ *创建时间:2023/9/18 17:45
+ */
+@Getter
+@Setter
+public class YhShopDistributeMoneyApply extends BaseEntity {
+
+	private Long userId;
+
+	private BigDecimal money;
+
+	private String reason;
+
+	private Status verifyStatus;
+
+	private Type type;
+
+	private String account;
+
+	private String realName;
+
+	private String img;
+
+	/**
+	 * 钱包地址
+	 */
+	private String walletAddr;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	private Long businessId;
+
+	private String businessName;
+
+	@Getter
+	public enum Type {
+		zfb("支付宝"),
+		wechat("微信"),
+		usdt("usdt"),
+		pwdRed("口令红包"),
+		other("其他")
+		;
+		String desc;
+
+		Type(String desc) {
+			this.desc = desc;
+		}
+
+		public DistributeMoneyApply.Type getType(String value) {
+			if (StrUtil.isEmpty(value)) {
+				return null;
+			}
+			return Arrays.stream(DistributeMoneyApply.Type.values()).filter(type -> type.name().equals(value)).findFirst().get();
+		}
+
+	}
+
+	@Getter
+	public enum Status {
+		success("审核成功"),
+		fail("审核失败"),
+		verifying("审核中"),
+		;
+		String desc;
+
+		Status(String desc) {
+			this.desc = desc;
+		}
+
+		public static YhShopDistributeMoneyApply.Status checkStatus(String status) {
+			return Arrays.stream(YhShopDistributeMoneyApply.Status.values()).filter(st -> st.name().equals(status)).findFirst().orElse(null);
+		}
+	}
+}
+

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

@@ -0,0 +1,22 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopDistributeOrdersDeductPointsRecord
+ *创建者: JavaZou
+ *创建时间:2023/9/20 16:29
+ */
+@Getter
+@Setter
+public class YhShopDistributeOrdersDeductPointsRecord extends BaseEntity{
+	private Long shopUserId;
+
+	private Long orderId;
+
+	private BigDecimal deductMoney;
+}

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

@@ -0,0 +1,64 @@
+package com.cyksj.model.entity;
+
+import com.cyksj.model.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopDistributeWaitingSendPoints
+ *创建者: JavaZou
+ *创建时间:2023/9/14 14:01
+ */
+@Getter
+@Setter
+public class YhShopDistributeWaitingSendPoints extends BaseEntity {
+	/**
+	 * 店铺用户id
+	 */
+	private Long userId;
+
+	/**
+	 * 店铺主id
+	 */
+	private Long shopUserId;
+
+	private Long orderId;
+
+	private Long skuId;
+
+	/**
+	 * 分成金额
+	 */
+	private BigDecimal money;
+
+	/**
+	 * 订单退款扣除的分成金额
+	 */
+	private BigDecimal refundMoney;
+
+	/**
+	 * 提成比例
+	 */
+	private Integer rate;
+
+	private Date sendTime;
+
+	private Status sendStatus;
+
+	public enum Status{
+		close("店铺分销订单关闭,积分奖励不分发"),
+		success("积分发送成功"),
+		waiting("积分等待发送"),
+		not_exist("用户不存在,导致发送失败"),
+		;
+		String desc;
+
+		Status(String desc) {
+			this.desc = desc;
+		}
+	}
+}

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

@@ -0,0 +1,18 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopGeneralGoodsRate
+ *创建者: JavaZou
+ *创建时间:2023/9/15 17:35
+ */
+@Getter
+@Setter
+public class YhShopGeneralGoodsRate extends BaseEntity{
+	private Long goodsId;
+
+	private Integer rate;
+}

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

@@ -0,0 +1,55 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+
+/**
+ * @author zwhui
+ * @date 2023/9/14 10:56
+ */
+@Getter
+@Setter
+@SearchBean(tables = "goods_don_sku sku left join yh_shop_goods_rate yr on yr.sku_id = sku.id")
+public class YhShopGoodsRate{
+
+
+    @TableId(value = "id",type = IdType.AUTO)
+    @DbField("yr.id")
+    private Long id;
+
+
+    @DbField("sku.goods_id")
+    private Long goodsId;
+
+    @DbField("sku.id")
+    private Long skuId;
+
+    @DbIgnore
+    private Integer rate;
+
+
+    /**
+     * 创建时间
+     */
+
+    @TableField(fill = FieldFill.INSERT)
+    @DbField("yr.created_time")
+    private Date createdTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @DbField("yr.update_time")
+    private Date updateTime;
+}

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

@@ -0,0 +1,34 @@
+package com.cyksj.model.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zwhui
+ * @date 2023/9/14 17:34
+ */
+@Data
+public class YhShopGoodsSku extends BaseEntity{
+    private Long goodsId;
+
+    private Long skuId;
+
+    private Long userId;
+
+    private Long yhsId;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+    /**
+     * true 上架 / false 下架
+     */
+    private Boolean status;
+    /**
+     * true 存在 / false 删除
+     */
+    private Boolean deleted;
+
+}

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

@@ -0,0 +1,31 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopUserBusinessDefaultRateConfig
+ *创建者: JavaZou
+ *创建时间:2023/9/18 17:05
+ */
+@Getter
+@Setter
+public class YhShopUserBusinessDefaultRateConfig extends BaseEntity {
+	private Long goodsId;
+
+	/**
+	 * 标准配置分销者比例
+	 */
+	private Integer rate;
+
+	/**
+	 * 最高可配置分销者比例
+	 */
+	private Integer maxRate;
+
+	/**
+	 * 超过配置最高分销者比例是否平台承担
+	 */
+	private Boolean isPlatPay;
+}

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

@@ -0,0 +1,77 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopUserDistributeBusinessOrderDonRecord
+ *创建者: JavaZou
+ *创建时间:2023/9/20 16:08
+ */
+
+@Getter
+@Setter
+public class YhShopUserDistributeBusinessOrderDonRecord extends BaseEntity {
+	/**
+	 * 商务id
+	 */
+	private Long businessId;
+
+	/**
+	 * 店铺主user_id
+	 */
+	private Long shopUserId;
+
+	/**
+	 * 产生分销订单用户id
+	 */
+	private Long userId;
+
+	/**
+	 * 首单时 座位id
+	 */
+	private Long preRelationId;
+
+	private Long orderId;
+
+	/**
+	 * 1首单,2续费
+	 */
+	private Integer orderType;
+
+	/**
+	 * 分销比例
+	 */
+	private Integer rate;
+
+	/**
+	 * 提成金额
+	 */
+	private BigDecimal takeMoney;
+
+	/**
+	 * 提成状态
+	 */
+	private Status status;
+
+	/**
+	 * 订单创建时间
+	 */
+	private Date orderCreatedTime;
+
+	@Getter
+	public enum Status {
+		success("成功"),
+		refund("失败"),
+		;
+		String desc;
+
+		Status(String desc) {
+			this.desc = desc;
+		}
+	}
+}

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

@@ -0,0 +1,43 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopUserDistributeBusinessRate
+ *创建者: JavaZou
+ *创建时间:2023/9/18 17:29
+ */
+@Getter
+@Setter
+public class YhShopUserDistributeBusinessRate extends BaseEntity {
+	/**
+	 * 商务用户id
+	 */
+	@NotNull
+	private Long businessId;
+
+	/**
+	 * 平台id
+	 */
+	private Long goodsId;
+
+	/**
+	 * 规格id
+	 */
+	private Long skuId;
+
+	/**
+	 * 首单提成比例
+	 */
+	private Integer firstOrderRate;
+
+	/**
+	 * 首单续费提成比例
+	 */
+	private Integer renewOrderRate;
+}
+

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

@@ -0,0 +1,30 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopUserDistributeShared
+ *创建者: JavaZou
+ *创建时间:2023/9/20 15:36
+ */
+@Getter
+@Setter
+public class YhShopUserDistributeShared extends BaseEntity{
+	/**
+	 * 被分享人id
+	 */
+	private Long userId;
+
+	/**
+	 * 店铺主user_id
+	 */
+	private Long shopUserId;
+
+	/**
+	 * 邀请方式备注
+	 */
+	private String remark;
+}
+

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

@@ -0,0 +1,70 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopUserPlatDistributeRate
+ *创建者: JavaZou
+ *创建时间:2023/9/18 14:23
+ */
+@Getter
+@Setter
+@SearchBean(tables = "goods_don g left join yh_shop_user_plat_distribute_rate ydr on g.id = ydr.goods_id :uid:" +
+		" left join yh_shop_general_goods_rate ygr on ygr.goods_id = g.id",
+		where = "g.type = 1 and g.status is true and g.deleted is true")
+public class YhShopUserPlatDistributeRate {
+	@TableId(value = "id", type = IdType.AUTO)
+	@DbField("ydr.id")
+	private Long id;
+
+	@DbField("g.id")
+	private Long goodsId;
+
+	@DbField("g.title")
+	@TableField(exist = false)
+	private String title;
+
+	/**
+	 * 店铺主id
+	 */
+	@DbField("ydr.user_id")
+	private Long userId;
+
+	/**
+	 * 分销比例
+	 */
+	@DbField("ifnull(ydr.rate,ygr.rate)")
+	private Integer rate = 0;
+
+	/**
+	 * 第二分销比例 不包含套餐
+	 */
+	@DbField("ydr.second_rate")
+	private Integer secondRate;
+
+
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@DbField("ydr.created_time")
+	private Date createdTime;
+
+	/**
+	 * 修改时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@DbField("ydr.update_time")
+	private Date updateTime;
+}

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelBannedAccountData.java

@@ -0,0 +1,25 @@
+package com.cyksj.model.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: ExcelBannedAccountData
+ * 创建者: JavaZou
+ * 创建时间:2023/10/7 15:35
+ */
+@Getter
+@Setter
+public class ExcelBannedAccountData {
+
+	@ExcelProperty("原账号")
+	private String oldAccount;
+
+	@ExcelProperty("新账号")
+	private String account;
+
+	@ExcelProperty("新账号密码")
+	private String password;
+}

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelGroupRelationData.java

@@ -0,0 +1,129 @@
+package com.cyksj.model.excel;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.cyksj.model.entity.GroupsTrips;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/*
+ *项目名: yhlxj
+ *文件名: ExcelGroupRelationData
+ *创建者: JavaZou
+ *创建时间:2023/9/12 18:01
+ */
+@Getter
+@Setter
+@SearchBean(tables = "groups_trips gt left join goods_don_sku sku on gt.sku_id = sku.id " +
+		"left join goods_don g on g.id = sku.goods_id " +
+		"left join account a on a.id = gt.account_id ")
+public class ExcelGroupRelationData {
+
+	@DbField("gt.id")
+	@ExcelIgnore
+	private Long groupId;
+
+	/**
+	 * 商品skuId
+	 */
+	@DbField("gt.sku_id")
+	@ExcelIgnore
+	private Long skuId;
+
+	/**
+	 * 账号id
+	 */
+	@DbField("gt.account_id")
+	@ExcelIgnore
+	private Long accountId;
+
+	/**
+	 * 账号
+	 */
+	@DbField("a.account")
+	@ExcelProperty("账号")
+	private String account;
+
+	/**
+	 * 密码
+	 */
+	@DbField("a.password")
+	@ExcelProperty("密码")
+	private String password;
+
+	/**
+	 * 商品id
+	 */
+	@DbField("g.id")
+	@ExcelIgnore
+	private Long goodsId;
+
+	/**
+	 * 标题
+	 */
+	@DbField("g.title")
+	@ExcelProperty("平台")
+	private String title;
+
+	/**
+	 * 商品规格
+	 */
+	@DbField("sku.spec_val")
+	@ExcelProperty("规格")
+	private String specVal;
+
+	/**
+	 * 车位数量
+	 */
+	@DbField("gt.num")
+	@ExcelProperty("车位数量")
+	private Integer num;
+
+	/**
+	 * 可用车位数
+	 */
+	@DbField("gt.available_num")
+	@ExcelProperty("剩余车位")
+	private Integer availableNum;
+
+	/**
+	 * 状态
+	 */
+	@DbField("gt.status")
+	@ExcelIgnore
+	private GroupsTrips.Status status;
+
+	/**
+	 * 状态
+	 */
+	@DbIgnore
+	@ExcelProperty("状态")
+	private String cnStatus;
+
+	@DbField("a.expiry_time")
+	@ExcelProperty("过期时间")
+	private Date expiryTime;
+
+	/**
+	 * 创建时间
+	 */
+	@DbField("gt.created_time")
+	@ExcelProperty("创建时间")
+	private Date createdTime;
+
+	/**
+	 * 更新时间
+	 */
+	@DbField("gt.update_time")
+	@ExcelIgnore
+	private Date updateTime;
+
+	public String getCnStatus() {
+		return status.getDesc();
+	}
+}

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelMonthlyDistributeOrderData.java

@@ -48,6 +48,15 @@ public class ExcelMonthlyDistributeOrderData {
 	@ExcelProperty({"分销提现数据","累计实际提现"})
 	private BigDecimal realApplyMoney;
 
+	@ExcelProperty({"分销提现数据", "自动转账金额"})
+	private BigDecimal autoMoney;
+
+	@ExcelProperty({"分销提现数据", "usdt转账金额"})
+	private BigDecimal usdtMoney;
+
+	@ExcelProperty({"分销提现数据", "手动转账金额"})
+	private BigDecimal manualMoney;
+
 	@ExcelProperty({"下单率","自然流量渠道","自然渠道用户数"})
 	private Integer natureUserSourceNum;
 

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

@@ -0,0 +1,38 @@
+package com.cyksj.model.manage.dto;
+
+import com.cyksj.model.request.GiftCardPayReq;
+import com.cyksj.model.views.GiftCardGoodsSkuFrontView;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/*
+ *项目名: yhlxj
+ *文件名: GiftCardDto
+ *创建者: JavaZou
+ *创建时间:2023/9/14 15:40
+ */
+@Getter
+@Setter
+public class GiftCardDto {
+	/**
+	 * 礼品类型
+	 */
+	private String gcShowType;
+
+	/**
+	 * 礼品卡赠送背景
+	 */
+	private String gcImg;
+
+	/**
+	 * 购买 礼品卡
+	 */
+	private List<GiftCardPayReq> giftCards;
+
+	/**
+	 * 购买信息
+	 */
+	private List<GiftCardGoodsSkuFrontView> gcPayDetail;
+}

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuInsert.java

@@ -91,6 +91,16 @@ public class ReqGoodsSkuInsert {
          */
         private List<GoodsDiscountPlusPurchaseRelation> dpSku;
 
+        /**
+         * 特定价格
+         */
+        private String specificPrice;
+
+        /**
+         * 特定平台购买用户人群
+         */
+        private String specificGoodsIds;
+
     }
 
 }

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuSpec.java

@@ -13,8 +13,6 @@ import java.util.List;
 @Getter
 @Setter
 public class ReqGoodsSkuSpec {
-    private Long id;
-
     private String key;
 
     private List<Node> values;
@@ -22,7 +20,7 @@ public class ReqGoodsSkuSpec {
     @Getter
     @Setter
     public static class Node {
-        private Long id;
+        private Integer id;
 
         private String value;
 

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSpecSingle.java

@@ -20,10 +20,10 @@ public class ReqGoodsSpecSingle {
     private Long goodsId;
 
     @NotNull(message = "缺少规格属性id")
-    private Long id;
+    private Integer id;
 
     @NotNull(message = "缺少总规格属性id")
-    private Long keyId;
+    private Integer keyId;
 
     @NotBlank(message = "缺少规格名")
     private String key;
@@ -31,5 +31,5 @@ public class ReqGoodsSpecSingle {
     @NotBlank(message = "缺少属性名.")
     private String name;
 
-    private Long maxId;
+    private Integer maxId;
 }

netflix-dao/src/main/java/com/cyksj/model/manage/views/GroupsRelationView.java

@@ -74,6 +74,9 @@ public class GroupsRelationView {
     @DbField("gr.user_id")
     private Long userId;
 
+    @DbField("gr.yhs_id")
+    private Long yhsId;
+
     @DbField("gr.start_time")
     private Date startTime;
 

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonBackView.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.manage.views;
 
+import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.entity.OrderDonTransport;
 import com.cyksj.model.entity.OrderDonWaybill;
@@ -36,6 +37,12 @@ public class OrderDonBackView {
 	@DbField("o.relation_id")
 	private Long relationId;
 
+	/**
+	 * 是否是额外硬塞的虚拟车票订单
+	 */
+	@DbField("o.is_ot")
+	private Boolean isOt;
+
 	/**
 	 * 邀请制用户账号
 	 */
@@ -63,6 +70,9 @@ public class OrderDonBackView {
 	@DbField("g.title")
 	private String title;
 
+	@DbField("g.special_type")
+	private GoodsDon.SpecialType goodsSpecialType;
+
 	@DbField("o.sku_id")
 	private Long skuId;
 
@@ -90,12 +100,18 @@ public class OrderDonBackView {
 	@DbField("u.email")
 	private String email;
 
+	@DbField("u.is_google")
+	private Boolean isGoogle;
+
 	@DbField("o.money")
 	private BigDecimal money;
 
 	@DbField("o.balance")
 	private BigDecimal balance;
 
+	@DbField("o.gc_cash")
+	private BigDecimal gcCash;
+
 	@DbField("o.refund_money")
 	private BigDecimal refundMoney;
 

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonSearchView.java

@@ -24,7 +24,7 @@ import java.util.List;
 @Getter
 @Setter
 @SearchBean(tables = "(select * from order_don :orderId:) o left join goods_don_sku sku on o.sku_id = sku.id " +
-		"left join goods_don g on g.id = sku.goods_id " +
+		"left join goods_don g on g.id = o.goods_id " +
 		"left join order_don_transport odt on odt.order_id = o.id")
 public class OrderDonSearchView {
 	@DbField("o.id")
@@ -153,6 +153,9 @@ public class OrderDonSearchView {
 	@DbIgnore
 	private List<GoodsDonSkuView> benefitsViews;
 
+	@DbField("o.pay_title")
+	private String payTitle;
+
 	/**
 	 * 关联兑换码
 	 */

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonView.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Getter
 @Setter
 @SearchBean(tables = "order_don o left join goods_don_sku sku on o.sku_id = sku.id " +
-        "left join goods_don g on g.id = sku.goods_id " +
+        "left join goods_don g on g.id = o.goods_id " +
         "left join order_don_transport odt on odt.order_id = o.id")
 public class OrderDonView {
 
@@ -149,6 +149,9 @@ public class OrderDonView {
     @DbField("g.special_type")
     private GoodsDon.SpecialType specialType;
 
+    @DbField("o.yhs_id")
+    private Long yhsId;
+
     @DbIgnore
     private OrderDonWaybill waybill;
 

netflix-dao/src/main/java/com/cyksj/model/manage/views/UserView.java

@@ -184,4 +184,7 @@ public class UserView {
      */
     @DbField("u.update_time")
     private Date updateTime;
+
+    @DbField("u.is_google")
+    private Boolean isGoogle;
 }

netflix-dao/src/main/java/com/cyksj/model/request/ApplyMoneyReq.java

@@ -33,4 +33,6 @@ public class ApplyMoneyReq {
 	 * 备注
 	 */
 	private String remark;
+
+	private Long userId;
 }

netflix-dao/src/main/java/com/cyksj/model/request/ChangeRelationReq.java

@@ -25,4 +25,6 @@ public class ChangeRelationReq {
 	private Boolean isOutside;
 
 	private UserTicketClearedRecord.Source source;
+
+	private Long yhsId;
 }

netflix-dao/src/main/java/com/cyksj/model/request/CombinationSkuReq.java

@@ -15,8 +15,6 @@ import java.util.List;
 @Getter
 @Setter
 public class CombinationSkuReq {
-	private Long id;
-
 	private String key;
 
 	private List<ReqGoodsSkuSpec.Node> values;

netflix-dao/src/main/java/com/cyksj/model/request/CorpActiveBulkMsg.java

@@ -0,0 +1,20 @@
+package com.cyksj.model.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: CorpActiveBulkMsg
+ *创建者: JavaZou
+ *创建时间:2023/8/28 16:51
+ */
+@Getter
+@Setter
+public class CorpActiveBulkMsg {
+	private String content;
+
+	private String img;
+
+	private Long wxCorpId;
+}

netflix-dao/src/main/java/com/cyksj/model/request/ExchangeCodeTicket.java

@@ -16,4 +16,9 @@ public class ExchangeCodeTicket {
 	 * 兑换码
 	 */
 	private String code;
+
+	/**
+	 * 店铺id
+	 */
+	private String customId;
 }

netflix-dao/src/main/java/com/cyksj/model/request/GiftCardGoodsSkuReq.java

@@ -0,0 +1,29 @@
+package com.cyksj.model.request;
+
+import com.cyksj.model.entity.GiftCardGoodsSku;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/*
+ *项目名: yhlxj
+ *文件名: GiftCardGoodsSkuReq
+ *创建者: JavaZou
+ *创建时间:2023/9/13 17:16
+ */
+@Getter
+@Setter
+public class GiftCardGoodsSkuReq {
+	/**
+	 * 礼品卡平台
+	 */
+	private Long goodsId;
+
+	/**
+	 * 礼品卡类型 1现金卡、2虚拟卡
+	 */
+	private Integer gcType;
+
+	private List<GiftCardGoodsSku> configs;
+}

netflix-dao/src/main/java/com/cyksj/model/request/GiftCardPayReq.java

@@ -0,0 +1,24 @@
+package com.cyksj.model.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: GiftCardPayReq
+ *创建者: JavaZou
+ *创建时间:2023/8/30 11:02
+ */
+@Getter
+@Setter
+public class GiftCardPayReq {
+	/**
+	 * 礼品卡id
+	 */
+	private Long gcId;
+
+	/**
+	 * 礼品卡购买数量
+	 */
+	private Integer num;
+}

netflix-dao/src/main/java/com/cyksj/model/request/GiftCardReceiveReq.java

@@ -0,0 +1,24 @@
+package com.cyksj.model.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+/*
+ *项目名: yhlxj
+ *文件名: GiftCardReceiveReq
+ *创建者: JavaZou
+ *创建时间:2023/9/19 15:01
+ */
+@Getter
+@Setter
+public class GiftCardReceiveReq {
+
+	@NotEmpty
+	private String code;
+
+	private Long userId;
+
+	private Long relationId;
+}

netflix-dao/src/main/java/com/cyksj/model/request/GoodsDonShopRateReq.java

@@ -0,0 +1,25 @@
+package com.cyksj.model.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zwhui
+ * @date 2023/9/14 16:22
+ */
+@Data
+public class GoodsDonShopRateReq {
+    private List<Long> goodsIds;
+
+    private Integer rate;
+
+    private List<GoodsDonShopRate> list;
+    @Data
+    public static class GoodsDonShopRate{
+        private Long id;
+        private Long goodsId;
+        private Long skuId;
+        private Integer rate;
+    }
+}

netflix-dao/src/main/java/com/cyksj/model/request/LoginReq.java

@@ -2,6 +2,7 @@ package com.cyksj.model.request;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 /*
  *项目名: netflix
@@ -11,6 +12,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@ToString
 public class LoginReq {
 	private String phone;
 
@@ -59,4 +61,11 @@ public class LoginReq {
 	private String callback;
 
 	private String callbackType;
+
+	private String subject;
+
+	/**
+	 * 店铺自定义id
+	 */
+	private String customId;
 }