Merge branch 'msg' into dev

# Conflicts:
#	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/impl/OrderDonServiceImpl.java
#	netflix-service/src/main/java/com/cyksj/service/user/impl/UserBenefitsServiceImpl.java
#	netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

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

@@ -250,4 +250,11 @@ public interface Constant {
 	 * 获客链接 值班客服更新定时任务id
 	 */
 	Integer CORP_LINK_JOB_ID = 192;
+
+	String DUTY_SERVICE_CHANGE_MSG = "%s值班人员不足三人【银河录像局】";
+
+	/**
+	 * 系统周末值班客服变更通知手机号
+	 */
+	String DUTY_SERVICE_CHANGE_NOTIFY_PHONE = "17681947535";
 }

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

@@ -45,6 +45,9 @@ public class SmsUtil {
     //国际腾讯云短信
     private static final String TENCENT_SMS_INTERNATIONAL_TEMPLATE_ID = "1705927";
 
+    //账号修改密码国际短信通知
+    private static final String TENCENT_SMS_ACCOUNT_INTERNATIONAL_TEMPLATE_ID = "2040574";
+
     private static final Logger log = LoggerFactory.getLogger(SmsUtil.class);
 
     public static void main(String[] args) {
@@ -94,6 +97,19 @@ public class SmsUtil {
     }
 
     public static Boolean sendTencent(Integer cid, String mobile, String msg) {
+        String templateId = TENCENT_SMS_TEMPLATE_ID;
+        if (cid != 86) {
+            templateId = TENCENT_SMS_INTERNATIONAL_TEMPLATE_ID;
+        }
+        return commonSendTencentSmsMsg(templateId, cid, mobile, msg);
+    }
+
+    public static Boolean sendAccountInternalSmsMsg(Integer cid, String mobile, String msg) {
+        String templateId = TENCENT_SMS_ACCOUNT_INTERNATIONAL_TEMPLATE_ID;
+        return commonSendTencentSmsMsg(templateId, cid, mobile, msg);
+    }
+
+    public static Boolean commonSendTencentSmsMsg(String templateId, Integer cid, String mobile, String msg) {
         try {
             /* 必要步骤：
              * 实例化一个认证对象，入参需要传入腾讯云账户密钥对secretId，secretKey。
@@ -108,8 +124,8 @@ public class SmsUtil {
              * 如有需要请在代码中查阅以获取最新的默认值 */
             httpProfile.setConnTimeout(60);
             /* 指定接入地域域名，默认就近地域接入域名为 sms.tencentcloudapi.com ，也支持指定地域域名访问，例如广州地域的域名为 sms.ap-guangzhou.tencentcloudapi.com
-            * 南京地域
-            * */
+             * 南京地域
+             * */
             httpProfile.setEndpoint("sms.ap-nanjing.tencentcloudapi.com");
 
             /* 非必要步骤:
@@ -138,10 +154,6 @@ public class SmsUtil {
             req.setSignName(TENCENT_SMS_SIGN_NAME);
 
             /* 模板 ID: 必须填写已审核通过的模板 ID */
-            String templateId = TENCENT_SMS_TEMPLATE_ID;
-            if (cid != 86) {
-                templateId = TENCENT_SMS_INTERNATIONAL_TEMPLATE_ID;
-            }
             req.setTemplateId(templateId);
 
             /* 模板参数: 模板参数的个数需要与 TemplateId 对应模板的变量个数保持一致，若无模板参数，则设置为空 */
@@ -164,7 +176,6 @@ public class SmsUtil {
             if ("Ok".equalsIgnoreCase(sendStatus.getCode())) {
                 return true;
             }
-            return false;
 
             // 也可以取出单个值，你可以通过官网接口文档或跳转到response对象的定义处查看返回字段的定义
             // System.out.println(res.getRequestId());

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

@@ -0,0 +1,19 @@
+package com.cyksj.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: UserSharedDto
+ * 创建者: JavaZou
+ * 创建时间:2024/1/2 15:41
+ */
+@Getter
+@Setter
+public class UserSharedDto {
+
+	private Long sharedId;
+
+	private Long dsPopularizeId;
+}

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

@@ -0,0 +1,17 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.AccountBlockedReplaceRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目名: netflix-job
+ * 文件名: AccountBlockedReplaceRecordMapper
+ * 创建者: JavaZou
+ * 创建时间:2024/1/16 16:39
+ */
+public interface AccountBlockedReplaceRecordMapper extends BaseMapper<AccountBlockedReplaceRecord> {
+	void batchInsert(@Param("list") List<AccountBlockedReplaceRecord> list);
+}

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

@@ -22,4 +22,6 @@ public interface GoodsDonSkuMapper  extends BaseMapper<GoodsDonSku> {
 	List<YhShopGoodsSku> selectSkuShops(@Param("list") List<Long> goodsIds);
 
 	List<Long> selectSingleSkuIdsByGoodsId(Long goodsId);
+
+	GoodsDonSku checkAndReturnMinPriceUserOwnsSku(@Param("goodsId") Long goodsId, @Param("dsUserId") Long dsUserId);
 }

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

@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cyksj.model.entity.GroupsRelation;
+import com.cyksj.model.entity.PhoneCode;
+import com.cyksj.model.manage.views.GroupsRelationBackView;
 import com.cyksj.model.manage.views.GroupsRelationView;
 import com.cyksj.model.views.GroupsRelationUserView;
 import com.cyksj.model.views.UserRecommendGoodsFrontView;
@@ -61,4 +63,8 @@ public interface GroupsRelationMapper extends BaseMapper<GroupsRelation> {
 	Integer selectNumWaitingGroups(Long skuId);
 
 	Integer selectLimitAvailableNum(@Param("skuId") Long skuId, @Param("maxNum") Integer maxNum);
+
+	GroupsRelationBackView getGroupRelationAccountView(Long relationId);
+
+	PhoneCode getAreaPhoneByUserId(Long userId);
 }

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

@@ -68,4 +68,6 @@ public interface OrderDonMapper extends BaseMapper<OrderDon> {
 	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);
+
+	Page<CorpTagUserOrderDataView> getTagUserTimeOrderData(@Param("page") Page<Object> objectPage, @Param("tagIdStr") String tagIdStr, @Param("toDate") String toDate, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

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

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

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

@@ -2,8 +2,11 @@ package com.cyksj.mapper.corp;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.CorpCustomerAcquisitionLink;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * @author chan
  * @date 2023/11/28 14:21
@@ -12,4 +15,6 @@ public interface CorpCustomerAcquisitionLinkMapper extends BaseMapper<CorpCustom
 
     @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);
+
+	List<CorpCustomerAcquisitionLink> selectActiveCodeByFollowIndx(@Param("list") List<Integer> updateFollowIndx);
 }

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

@@ -2,6 +2,9 @@ package com.cyksj.mapper.corp;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.CorpFollowActiveCode;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目名: yhlxj
@@ -10,4 +13,6 @@ import com.cyksj.model.entity.CorpFollowActiveCode;
  * 创建时间:2023/10/9 16:27
  */
 public interface CorpFollowActiveCodeMapper extends BaseMapper<CorpFollowActiveCode> {
+
+	List<CorpFollowActiveCode> selectActiveCodeByFollowIndx(@Param("list") List<Integer> indx);
 }

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

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

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cyksj.model.entity.CorpUserTag;
 import com.cyksj.model.excel.CorpUserTagExcelData;
 import com.cyksj.model.views.CorpUserView;
+import com.cyksj.model.views.UserOrderDetailView;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +19,6 @@ public interface CorpUserTagMapper extends BaseMapper<CorpUserTag> {
 	Page<CorpUserView> selectCorpUserDetailByCondition(@Param("page") Page<CorpUserView> page, @Param("groupId") String groupId, @Param("tagId") String tagId, @Param("wxCorpId") Long wxCorpId);
 
 	List<CorpUserTagExcelData> exportUserTagDetail(@Param("tagIds") String[] tagIds, @Param("groupIds") String[] groupIds, @Param("wxCorpId") Long wxCorpId);
+
+	UserOrderDetailView countTagUser(@Param("tagIdStr") String tagIdStr, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

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

@@ -0,0 +1,11 @@
+package com.cyksj.mapper.corp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.QyMsgContent;
+
+/**
+ * @author chan
+ * @date 2024/1/22 15:07
+ */
+public interface QyMsgContentMapper extends BaseMapper<QyMsgContent> {
+}

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

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.manage.distribute;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserDistributeSharedWhite;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: UserDistributeSharedWhiteMapper
+ * 创建者: JavaZou
+ * 创建时间:2024/1/8 10:29
+ */
+public interface UserDistributeSharedWhiteMapper extends BaseMapper<UserDistributeSharedWhite> {
+}

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.MonthlyUserOrderDetailDto;
 import com.cyksj.model.dto.NatureOrderDataDto;
 import com.cyksj.model.excel.statistics.ExcelAppleOneData;
 import org.apache.ibatis.annotations.Param;
@@ -71,4 +72,6 @@ public interface StatisticsExportMapper{
 	Map<String, BigDecimal> getTransferData(@Param("startDate") String startDate, @Param("endDate") String endDate);
 
 	List<NatureOrderDataDto> getGroupsOrderData(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+	List<MonthlyUserOrderDetailDto> getMonthlyUserOrderDetail(@Param("thisMonth") DateTime thisMonth, @Param("nextMonth") DateTime nextMonth);
 }

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

@@ -15,10 +15,15 @@ import lombok.Setter;
 public class CorpFollowActiveCodeDto {
 
 	/**
-	 * 企业微信的客服id 数组
+	 * 客服id 数组
 	 */
 	private String followIds;
 
+	/**
+	 * 最新 值班客服id
+	 */
+	private String userIndxList;
+
 	/**
 	 * 对应系统配置的客服
 	 */

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

@@ -0,0 +1,22 @@
+package com.cyksj.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: MonthlyUserOrderDetailDto
+ * 创建者: JavaZou
+ * 创建时间:2024/1/3 16:38
+ */
+@Getter
+@Setter
+public class MonthlyUserOrderDetailDto {
+	private Integer type;
+
+	private Integer orders;
+
+	private BigDecimal money;
+}

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

@@ -0,0 +1,22 @@
+package com.cyksj.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: SysServiceChangeDto
+ * 创建者: JavaZou
+ * 创建时间:2024/1/11 16:47
+ */
+@Getter
+@Setter
+public class SysServiceChangeDto {
+	private Boolean changeCsImg = false;
+
+	private Boolean changeCsName = false;
+
+	private List<Integer> updateFollowIndxs;
+}

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

@@ -0,0 +1,55 @@
+package com.cyksj.model.dto;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: YhServiceChangeDto
+ * 创建者: JavaZou
+ * 创建时间:2024/1/8 17:52
+ */
+@Getter
+@Setter
+public class YhServiceChangeDto {
+	private List<String> beforeSelect;
+
+	private List<String> afterSelect;
+
+	private String sign;
+
+	private Integer index;
+
+	private String date;
+
+	private String workType;
+
+	public String toChangeString() {
+		StringBuilder sb = new StringBuilder();
+		if (StrUtil.equals(sign, "workday")) {
+			sb.append("工作日").append(index == 1 ? "早班" : "晚班");
+		} else if (StrUtil.equals(sign, "Saturday")) {
+			sb.append("周六").append(index == 3 ? "早班" : "晚班");
+		} else if (StrUtil.equals(sign, "Sunday")) {
+			sb.append("周日").append(index == 5 ? "早班" : "晚班");
+		} else {
+			sb.append("节假日").append(date).append(workType);
+		}
+		if (beforeSelect.size() > 0) {
+			sb.append(" - 移除 - ");
+			String beforeCollect = beforeSelect.stream().collect(Collectors.joining("、"));
+			sb.append(beforeCollect);
+		}
+
+		if (afterSelect.size() > 0) {
+			sb.append(" - 增加 - ");
+			String afterCollect = afterSelect.stream().collect(Collectors.joining("、"));
+			sb.append(afterCollect);
+		}
+		return sb.toString();
+	}
+}

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

@@ -39,6 +39,8 @@ public class YhServiceDto {
 
 	private String date;
 
+	private String workType;
+
 
 	@Getter
 	@Setter

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

@@ -0,0 +1,24 @@
+package com.cyksj.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: YhServiceNameDto
+ * 创建者: JavaZou
+ * 创建时间:2024/1/11 15:45
+ */
+@Getter
+@Setter
+public class YhServiceNameDto {
+	private String name;
+
+	private String img;
+
+	private Integer indx;
+
+	private String url;
+
+	private String followId;
+}

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

@@ -0,0 +1,50 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 项目名: netflix-job
+ * 文件名: AccountBlockedReplaceRecord
+ * 创建者: JavaZou
+ * 创建时间:2024/1/16 16:37
+ */
+@Getter
+@Setter
+@SearchBean(tables = "account_blocked_replace_record ar left join goods_don g on g.id = ar.goods_id")
+public class AccountBlockedReplaceRecord {
+
+
+	@DbField("ar.id")
+	private Long id;
+
+	@DbField("ar.account")
+	private String account;
+
+	@DbField("ar.goods_id")
+	private Long goodsId;
+
+	@DbField("a.title")
+	@TableField(exist = false)
+	private String title;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@DbField("ar.created_time")
+	private Date createdTime;
+
+	/**
+	 * 修改时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@DbField("ar.update_time")
+	private Date updateTime;
+}

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

@@ -60,6 +60,12 @@ public class ChannelPopularize extends BaseEntity{
     @JsonIgnore
     private String couponIds;
 
+    /**
+     * 回传过滤平台
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String filterGoodsIds;
+
     @DbIgnore
     @TableField(exist = false)
     private List<CouponTfPopularizeView> coupons;

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author chan

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

@@ -27,7 +27,7 @@ public class CorpFollowActiveCode extends BaseEntity{
 	@TableField(exist = false)
 	@DbIgnore
 	@NotNull(message = "请选择对应客服")
-	private List<String> followIds;
+	private List<Integer> userIndxList;
 
 	/**
 	 * 客服

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

@@ -0,0 +1,19 @@
+package com.cyksj.model.entity;
+
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Data;
+
+/**
+ * @author chan
+ * @date 2024/1/18 14:00
+ */
+@Data
+@SearchBean(tables = " corp_follow cf,corp_msg_follow_association ca ", where = "cf.userid = ca.follow_id")
+public class CorpMsgFollowAssociation extends BaseEntity{
+
+    private String followId;
+
+    private String associationFollowId;
+
+    private String nickname;
+}

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

@@ -1,5 +1,6 @@
 package com.cyksj.model.entity;
 
+import com.ejlchina.searcher.bean.DbField;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
@@ -74,6 +75,11 @@ public class CorpUserFollowRelation extends BaseEntity implements Serializable {
 	 */
 	private String delUserid;
 
+	/**
+	 * 会话存档同意情况 同意:"Agree"，不同意:"Disagree"
+	 */
+	private String agreeStatus;
+
 	@AllArgsConstructor
 	@Getter
 	public enum Way {

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

@@ -204,6 +204,11 @@ public class GoodsDon extends BaseEntity {
      */
     private Boolean isSp;
 
+    /**
+     * 是否有专属用户规格属性
+     */
+    private Boolean isOwns;
+
     /**
      * 是否参与分销 默认参与
      */

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

@@ -2,6 +2,7 @@ package com.cyksj.model.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.cyksj.model.views.DistributeSearchView;
 import com.cyksj.model.views.GoodsDiscountPlusPurchaseRelationFrontView;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
@@ -107,6 +108,19 @@ public class GoodsDonSku extends BaseEntity {
      */
     private BigDecimal price;
 
+    /**
+     * 专属用户规格
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String userOwns;
+
+    /**
+     * 专属用户列表
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private List<DistributeSearchView> userOwnsList;
+
     /**
      * 是否开启实物车票时长权益
      */

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

@@ -0,0 +1,118 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class QyMsgContent {
+
+	@TableId(value = "id",type = IdType.AUTO)
+	private Long id;
+	/**
+	 * 消息id，消息的唯一标识，企业可以使用此字段进行消息去重
+	 */
+	private String msgid;
+	/**
+	 * 消息动作，目前有send(发送消息)/recall(撤回消息)/switch(切换企业日志)三种类型
+	 */
+	private String action;
+
+	/**
+	 * 成员id
+	 */
+	private String followId;
+
+	/**
+	 * 客户id
+	 */
+	private String externalUserid;
+
+	/**
+	 * 消息发送方id。同一企业内容为userid，非相同企业为external_userid。消息如果是机器人发出，也为external_userid
+	 */
+	@TableField("`from`")
+	private String from;
+
+	private String fromView;
+	/**
+	 * 消息接收方列表，可能是多个，同一个企业内容为userid，非相同企业为external_userid。数组
+	 */
+	private String tolist;
+
+	private String tolistView;
+	/**
+	 * 群聊消息的群id
+	 */
+	private String roomid;
+
+	private String roomidView;
+	/**
+	 * 消息发送时间戳，utc时间，ms单位
+	 */
+	private String msgtime;
+	/**
+	 * 消息类型
+	 */
+	private String msgtype;
+	/**
+	 * 文字
+	 */
+	private String text;
+	/**
+	 * 图片
+	 */
+	private String image;
+	/**
+	 * 小程序
+	 */
+	private String weapp;
+	/**
+	 * 红包消息
+	 */
+	private String redpacket;
+	/**
+	 * 文件
+	 */
+	private String file;
+	/**
+	 * 视频
+	 */
+	private String video;
+	/**
+	 * 语音
+	 */
+	private String voice;
+	/**
+	 * 多条聊天记录
+	 */
+	private String chatrecord;
+	/**
+	 * 文件名称
+	 */
+	private String filename;
+	/**
+	 * 撤回
+	 */
+	@TableField("`revoke`")
+	private String revoke;
+	/**
+	 * 表情包
+	 */
+	private String emotion;
+	/**
+	 * 卡片消息
+	 */
+	private String card;
+	/**
+	 * 文件URL
+	 */
+	private String url;
+
+}

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

@@ -58,4 +58,6 @@ public class RefundOrderDon extends BaseEntity{
 	 * 默认false
 	 */
 	private Boolean isClearBalance;
+
+	private String operator;
 }

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

@@ -19,4 +19,6 @@ public class SysConfigChangeRecord extends BaseEntity{
 	private String backValue;
 
 	private String operator;
+
+	private String changeStr;
 }

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

@@ -0,0 +1,50 @@
+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;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: UserDistributeSharedWhite
+ * 创建者: JavaZou
+ * 创建时间:2024/1/8 10:28
+ */
+@Getter
+@Setter
+@SearchBean(tables = "user_distribute_shared_white uw left join user u on u.id = uw.user_id")
+public class UserDistributeSharedWhite {
+
+	@TableId(value = "id",type = IdType.AUTO)
+	@DbField("uw.id")
+	private Long id;
+
+	@DbField("uw.user_id")
+	private Long userId;
+
+	@DbField("u.nickname")
+	@TableField(exist = false)
+	private String nickname;
+
+	/**
+	 * 创建时间
+	 */
+
+	@TableField(fill = FieldFill.INSERT)
+	@DbField("uw.created_time")
+	private Date createdTime;
+
+	/**
+	 * 修改时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@DbField("uw.update_time")
+	private Date updateTime;
+}

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

@@ -0,0 +1,22 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: UserDoubleVerifyCodeChangeRecord
+ * 创建者: JavaZou
+ * 创建时间:2024/1/8 16:46
+ */
+@Getter
+@Setter
+public class UserDoubleVerifyCodeChangeRecord extends BaseEntity{
+	private Long userId;
+
+	private Integer oldVerifyCheckNum;
+
+	private Integer verifyCheckNum;
+
+	private String operator;
+}

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

@@ -5,6 +5,8 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /*
  *项目名: netflix
  *文件名: ExcelMonthOrderData
@@ -69,6 +71,18 @@ public class ExcelMonthOrderData {
 	@ExcelProperty({"品类数据类", "AI类复购数据", "C.A用户中购买第二单流媒体产品的用户数"})
 	private Integer monthAiNewPayStreamingNumOfUser;
 
+	@ExcelProperty({"用户维度", "当月新用户", "订单量"})
+	private Integer monthlyNewUserOrders;
+
+	@ExcelProperty({"用户维度", "当月新用户", "金额"})
+	private BigDecimal monthlyNewUserOrdersMoney;
+
+	@ExcelProperty({"用户维度", "当月之前老用户", "订单量"})
+	private Integer monthlyBeforeUserOrders;
+
+	@ExcelProperty({"用户维度", "当月之前老用户", "金额"})
+	private BigDecimal monthlyBeforeUserOrdersMoney;
+
 //	@ExcelProperty({"历史复购","有奈飞车票的人数"})
 //	private Integer nfTicketNumOfUser;
 //

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

@@ -66,6 +66,11 @@ public class ReqGoodsSkuInsert {
 
         private BigDecimal price;
 
+        /**
+         * 专属用户规格
+         */
+        private String userOwns;
+
         /**
          * 数量
          */
@@ -104,7 +109,7 @@ public class ReqGoodsSkuInsert {
         /**
          * 特定价格
          */
-        private String specificPrice;
+        private BigDecimal specificPrice;
 
         /**
          * 特定平台购买用户人群

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

@@ -0,0 +1,71 @@
+package com.cyksj.model.manage.views;
+
+import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 会话聊天框列表
+ * @author chan
+ * @date 2024/1/22 17:16
+ */
+@Data
+@SearchBean(tables = "(SELECT external_userid userid, q.follow_id follow_id, MAX(id) msgId " +
+        "FROM qy_msg_content q " +
+        " :keyword: " +
+        "GROUP BY q.external_userid , q.follow_id " +
+        "ORDER BY MAX(q.id) desc limit 1) t " +
+        "LEFT JOIN qy_msg_content qm on qm.id = t.msgId " +
+        "LEFT JOIN corp_user_auth cu on cu.external_userid = t.userid " +
+        "LEFT JOIN corp_user c on c.id = cu.corp_user_id "
+)
+public class CorpFollowMsgView {
+
+    /**
+     * 用户名称
+     */
+    @DbField("c.name")
+    private String name;
+
+    /**
+     * 用户头像
+     */
+    @DbField("c.avatar")
+    private String avatar;
+
+    /**
+     * 成员id
+     */
+    @DbField("t.follow_id")
+    private String followId;
+
+    /**
+     * 用户id
+     */
+    @DbField("t.userid")
+    private String userid;
+
+    /**
+     * 最近消息文本内容
+     */
+    @DbField("qm.text")
+    private String msgText;
+
+    /**
+     * 最近消息类型
+     */
+    @DbField("qm.msgtype")
+    private String msgType;
+
+    /**
+     * 最近消息时间
+     */
+    @DbField("qm.msgtime")
+    private String msgtime;
+
+
+}

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

@@ -0,0 +1,68 @@
+package com.cyksj.model.manage.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author chan
+ * @date 2024/1/22 14:41
+ */
+
+@Data
+@SearchBean(tables = " corp_user c,corp_user_auth cu, corp_follow f, corp_user_follow_relation cr ,corp_user_tag t ",
+        where = " c.id = cu.corp_user_id " +
+                "and cu.external_userid = cr.corp_user_id " +
+                "and f.userid = cr.follow_id " +
+                ":tag:",
+        groupBy = "c.name,cu.external_userid,c.avatar,c.type,c.gender,f.name,cr.agree_status,cr.add_created_time"
+)
+public class CorpMsgAuditUserView {
+
+    /**
+     * 外部联系人的名称
+     */
+    @DbField("c.name")
+    private String name;
+
+    @DbField("cu.external_userid")
+    private String externalUserid;
+
+    /**
+     * 外部联系人头像，代开发自建应用需要管理员授权才可以获取，第三方不可获取，上游企业不可获取下游企业客户该字段
+     */
+    @DbField("c.avatar")
+    private String avatar;
+
+    /**
+     * 外部联系人的类型，1表示该外部联系人是微信用户，2表示该外部联系人是企业微信用户
+     */
+    @DbField("c.type")
+    private Integer type;
+
+    /**
+     * 外部联系人性别 0-未知 1-男性 2-女性。第三方不可获取，上游企业不可获取下游企业客户该字段，返回值为0，表示未定义
+     */
+    @DbField("c.gender")
+    private Integer gender;
+
+    /**
+     * 成员名称
+     */
+    @DbField("f.name")
+    private String followName;
+
+    /**
+     * 会话存档同意情况 同意:"Agree"，不同意:"Disagree"
+     */
+    @DbField("cr.agree_status")
+    private String agreeStatus;
+
+    /**
+     * 添加时间
+     */
+    @DbField("cr.add_created_time")
+    private Date addCreatedTime;
+}

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

@@ -0,0 +1,45 @@
+package com.cyksj.model.manage.views;
+
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Data;
+import org.aspectj.weaver.ast.Or;
+
+import java.util.List;
+
+/**
+ * @author chan
+ * @date 2024/1/18 14:50
+ */
+@Data
+@SearchBean(tables = " corp_follow")
+public class CorpMsgFollowAssociationView {
+
+    private Long wxCorpId;
+
+    /**
+     * 成员UserID
+     */
+    private String userid;
+
+    /**
+     * 成员名称
+     */
+    private String name;
+
+    /**
+     * 头像地址
+     */
+    private String avatar;
+
+    /**
+     * 头像缩略图
+     */
+    private String thumbAvatar;
+
+    /**
+     * 关联关系
+     */
+    @DbIgnore
+    private List<CorpMsgFollowAssociationView> associationList;
+}

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

@@ -0,0 +1,50 @@
+package com.cyksj.model.manage.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Data;
+
+/**
+ * 企微工具会话列表
+ * @author chan
+ * @date 2024/1/24 13:43
+ */
+@SearchBean(tables = " qy_msg_content q, " +
+        " corp_user c, " +
+        " corp_user_auth cu, " +
+        " corp_follow cf ",
+        where = "q.external_userid = cu.external_userid   " +
+                " AND cu.corp_user_id = c.id   " +
+                " AND q.follow_id = cf.userid " +
+                "AND q.follow_id in (:followId:)",
+        groupBy = "c.name,c.avatar,cu.external_userid ,cf.name,cf.avatar"
+)
+@Data
+public class CorpQyMsgAuditChatView {
+    /**
+     * 外部联系人的名称
+     */
+    @DbField("c.name")
+    private String name;
+
+    /**
+     * 外部联系人头像，代开发自建应用需要管理员授权才可以获取，第三方不可获取，上游企业不可获取下游企业客户该字段
+     */
+    @DbField("c.avatar")
+    private String avatar;
+
+    @DbField("cu.external_userid")
+    private String externalUserid;
+
+    /**
+     * 成员名称
+     */
+    @DbField("f.name")
+    private String followName;
+
+    /**
+     * 成员头像
+     */
+    @DbField("f.avatar")
+    private String followAvatar;
+}

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

@@ -0,0 +1,80 @@
+package com.cyksj.model.manage.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author chan
+ * @date 2024/1/19 10:43
+ */
+@Data
+@SearchBean(tables = " corp_user c, corp_user_auth cu ,corp_user_follow_relation cr, corp_user_tag t ",
+        where = "cu.corp_user_id = c.id " +
+                "and cu.external_userid = cr.corp_user_id " +
+                "and cr.id = t.relation_id ",
+        groupBy = "c.name, c.avatar, c.type, c.gender, c.unionid, c.user_id, c.state, c.mark_info, c.created_time"
+)
+public class CorpUserView {
+
+    /**
+     * 外部联系人的名称
+     */
+    @DbField("c.name")
+    private String name;
+
+    /**
+     * 外部联系人头像，代开发自建应用需要管理员授权才可以获取，第三方不可获取，上游企业不可获取下游企业客户该字段
+     */
+    @DbField("c.name")
+    private String avatar;
+
+    /**
+     * 外部联系人的类型，1表示该外部联系人是微信用户，2表示该外部联系人是企业微信用户
+     */
+    @DbField("c.type")
+    private Integer type;
+
+    /**
+     * 外部联系人性别 0-未知 1-男性 2-女性。第三方不可获取，上游企业不可获取下游企业客户该字段，返回值为0，表示未定义
+     */
+    @DbField("c.gender")
+    private Integer gender;
+
+    /**
+     * 外部联系人在微信开放平台的唯一身份标识（微信unionid），通过此字段企业可将外部联系人与公众号/小程序用户关联起来。仅当联系人类型是微信用户，且企业绑定了微信开发者ID有此字段。
+     */
+    @DbField("c.unionid")
+    private String unionid;
+
+    /**
+     * user表 关联用户id
+     */
+    @DbField("c.user_id")
+    private Long userId;
+
+    /**
+     * 添加渠道来源
+     */
+    @DbField("c.state")
+    private String state;
+
+    /**
+     * 客服标记内容
+     */
+    @DbField("c.mark_info")
+    private String markInfo;
+
+    @DbField("c.created_time")
+    private Date createdTime;
+
+
+    /**
+     * 标签组
+     */
+    @DbField("group_concat(t.tag_name)")
+    private List<String> tags;
+}

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

@@ -23,9 +23,9 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "order_don o left join goods_don g on g.id = o.goods_id " +
-		"left join user u on o.user_id = u.id " +
-		"left join order_don_transport odt on odt.order_id = o.id ",
+@SearchBean(tables = "order_don o left join goods_don g on g.id = o.goods_id" +
+		" left join order_don_transport odt on odt.order_id = o.id" +
+		" left join goods_don_sku sku on sku.id = o.sku_id",
 		where = ":condition:"
 )
 public class OrderDonBackView {
@@ -86,33 +86,33 @@ public class OrderDonBackView {
 	@DbField("o.goods_id")
 	private Long goodsId;
 
-	@DbIgnore
+	@DbField("sku.spec_val")
 	private String specVal;
 
+	@DbField("sku.is_benefits")
+	private Boolean isBenefits;
+
 	@DbField("o.user_id")
 	private Long userId;
 
-	@DbField("u.nickname")
+	@DbIgnore
 	private String nickname;
 
-	@DbField("case when u.login_phone != '' then 'phone' when u.email != '' then 'email' when u.open_id != '' then 'wechat' else 'wechat' end")
+	@DbIgnore
 	private String register;
 
 	/**
 	 * 登录注册手机号
 	 */
-	@DbField("u.login_phone")
+	@DbIgnore
 	private String loginPhone;
 
 	/**
 	 * 登录注册邮箱
 	 */
-	@DbField("u.email")
+	@DbIgnore
 	private String email;
 
-	@DbField("u.is_google")
-	private Boolean isGoogle;
-
 	@DbField("o.money")
 	private BigDecimal money;
 
@@ -146,10 +146,10 @@ public class OrderDonBackView {
 	@DbField("o.tv_type")
 	private Integer tvType;
 
-	@DbIgnore
+	@DbField("sku.months")
 	private Integer months;
 
-	@DbIgnore
+	@DbField("sku.days")
 	private Integer days;
 
 	@DbField("o.num")
@@ -227,6 +227,21 @@ public class OrderDonBackView {
 	@DbField("o.phone")
 	private String orderPhone;
 
+	@DbField("o.yhs_id")
+	private Long yhsId;
+
+	/**
+	 * 店铺自定义id
+	 */
+	@DbIgnore
+	private String customId;
+
+	/**
+	 * 店铺名
+	 */
+	@DbIgnore
+	private String shopName;
+
 	@DbIgnore
 	private OrderDonWaybill waybill;
 

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

@@ -39,4 +39,8 @@ public class OrderRefundReq {
 	 * 补差价余额
 	 */
 	private BigDecimal refundBalance;
+
+	private Boolean isOnly;
+
+	private String operator;
 }

netflix-dao/src/main/java/com/cyksj/model/response/GptStandbyResp.java

@@ -1,9 +1,12 @@
 package com.cyksj.model.response;
 
 
+import com.cyksj.model.views.RenewalView;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public class GptStandbyResp {
@@ -13,6 +16,13 @@ public class GptStandbyResp {
      */
     private Boolean isHasAccount;
 
+    /**
+     * 候补车票账号
+     */
+    private List<RenewalView> overTen;
+
+    private List<RenewalView> underTen;
+
     /**
      * 是否申请候补
      */

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

@@ -66,6 +66,9 @@ public class ChannelPopularizeView {
     @DbField("cp.is_show_logo")
     private Boolean isShowLogo;
 
+    @DbField("cp.filter_goods_ids")
+    private String filterGoodsIds;
+
     /**
      * 浏览数
      */

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

@@ -36,7 +36,7 @@ public class CorpFollowActiveCodeView {
 	private String followStr;
 
 	@DbIgnore
-	private List<String> followIds;
+	private List<Integer> userIndxList;
 
 	/**
 	 * 欢迎语内容 文本、附件

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

@@ -1,6 +1,7 @@
 package com.cyksj.model.views;
 
 import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
@@ -25,7 +26,7 @@ public class CorpMsgBulkTaskSendRecordView {
 	/**
 	 * 总数
 	 */
-	@DbField("count(cr.id)")
+	@DbIgnore
 	private Integer total;
 
 	/**
@@ -37,7 +38,7 @@ public class CorpMsgBulkTaskSendRecordView {
 	/**
 	 * 未送达
 	 */
-	@DbField("count(if(cr.status != 1,cr.id,null))")
+	@DbIgnore
 	private Integer notSend;
 
 	@DbField("any_value(cmr.created_time)")

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

@@ -0,0 +1,37 @@
+package com.cyksj.model.views;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: CorpTagUserOrderDataView
+ * 创建者: JavaZou
+ * 创建时间:2024/1/11 14:57
+ */
+@Getter
+@Setter
+public class CorpTagUserOrderDataView {
+	private Long orderId;
+
+	private Long userId;
+
+	private String nickname;
+
+	private String orderNo;
+
+	private Long goodsId;
+
+	private String title;
+
+	private Long skuId;
+
+	private String specVal;
+
+	private BigDecimal money;
+
+	private Date createdTime;
+}

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

@@ -0,0 +1,18 @@
+package com.cyksj.model.views;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: DistributeGoodsGeneralRateView
+ * 创建者: JavaZou
+ * 创建时间:2024/1/11 14:26
+ */
+@Getter
+@Setter
+public class DistributeGoodsGeneralRateView {
+	private Integer rate;
+
+	private String goodsInfo;
+}

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

@@ -1,6 +1,5 @@
 package com.cyksj.model.views;
 
-import com.cyksj.model.entity.GoodsDon;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -68,5 +67,5 @@ public class DistributePopularizeView {
 	/**
 	 * 普通低分销比例
 	 */
-	private List<GoodsDon> generalDistributes;
+	private List<DistributeGoodsGeneralRateView> generalDistributes;
 }

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

@@ -0,0 +1,27 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: DistributeSearchView
+ * 创建者: JavaZou
+ * 创建时间:2024/1/2 15:34
+ */
+@Getter
+@Setter
+@SearchBean(tables = "user_distribute ud inner join user u on u.id = ud.user_id and ud.deleted is true")
+public class DistributeSearchView {
+
+	@DbField("ud.id")
+	private Long distributeId;
+
+	@DbField("u.nickname")
+	private String nickname;
+
+	@DbField("ud.user_id")
+	private Long userId;
+}

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

@@ -90,6 +90,11 @@ public class GoodsDonSkuFrontView {
 	 */
 	private BigDecimal price;
 
+	/**
+	 * 专属用户规格
+	 */
+	private String userOwns;
+
 	/**
 	 * 月数
 	 */

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

@@ -109,6 +109,10 @@ public class GoodsFrontListCategoryView {
 	@DbField("g.is_sp")
 	private Boolean isSp;
 
+
+	@DbField("g.is_owns")
+	private Boolean isOwns;
+
 	@DbField("g.video")
 	private String video;
 

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

@@ -128,6 +128,9 @@ public class GoodsFrontListView {
 	@DbField("g.is_sp")
 	private Boolean isSp;
 
+	@DbField("g.is_owns")
+	private Boolean isOwns;
+
 	@DbField("g.detail")
 	private String detail;
 

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

@@ -25,6 +25,11 @@ public class GroupsDataStatisticsView {
 
 	private BigDecimal channelMoney;
 
+	/**
+	 * 解绑渠道销售金额
+	 */
+	private BigDecimal unBindChannelMoney;
+
 	/**
 	 * 个人销售金额
 	 */
@@ -71,4 +76,19 @@ public class GroupsDataStatisticsView {
 	 * 非续费金额
 	 */
 	private BigDecimal newBuyOrderMoney;
+
+	/**
+	 * 解绑渠道流媒体销售金额
+	 */
+	private BigDecimal unBIndGroupsStreamingMoney;
+
+	/**
+	 * 解绑渠道 Ai销售金额
+	 */
+	private BigDecimal unBIndGroupsAiOrderMoney;
+
+	/**
+	 * 解绑渠道 设备销售金额
+	 */
+	private BigDecimal unBIndGroupsEpOrderMoney;
 }

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

@@ -1,7 +1,6 @@
 package com.cyksj.model.views;
 
 import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,7 +20,9 @@ import java.util.Date;
 		" left join groups_relation_independent_renew gnr on gnr.order_id = o.id" +
 		" inner join user u on u.id = gr.user_id" +
 		" left join goods_don_sku sku on sku.id = o.sku_id" +
-		" left join goods_don g on g.id = o.goods_id",
+		" left join goods_don g on g.id = o.goods_id" +
+		" left join groups_trips gt on gt.id = gr.groups_id" +
+		" left join account a on a.id = gt.account_id",
 		where = ":condition:")
 public class GroupsRelationIndependentView {
 	@DbField("gr.id")
@@ -33,10 +34,10 @@ public class GroupsRelationIndependentView {
 	@DbField("o.id")
 	private Long orderId;
 
-	@DbIgnore
+	@DbField("a.account")
 	private String account;
 
-	@DbIgnore
+	@DbField("a.password")
 	private String password;
 
 	@DbField("gr.user_id")
@@ -51,7 +52,7 @@ public class GroupsRelationIndependentView {
 	@DbField("gr.expiry_time")
 	private Date expiryTime;
 
-	@DbIgnore
+	@DbField("a.expiry_time")
 	private Date accountExpiryTime;
 
 	@DbField("ifnull(gnr.is_renew,false)")

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

@@ -43,6 +43,9 @@ public class HomeManagementFrontView {
 	@DbField("g.logo")
 	private String logo;
 
+	@DbField("g.is_owns")
+	private Boolean isOwns;
+
 	@DbField("hc.url")
 	private String url;
 

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

@@ -0,0 +1,30 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: RefundOrderDonServiceDataView
+ * 创建者: JavaZou
+ * 创建时间:2024/1/8 17:03
+ */
+@Getter
+@Setter
+@SearchBean(tables = "refund_order_don rd inner join order_don o on o.id = rd.order_id :time:",
+		where = "rd.refund_method not in ('EX_CODE','balance')",
+		groupBy = "rd.operator")
+public class RefundOrderDonServiceDataView {
+	@DbField("rd.operator")
+	private String operator;
+
+	@DbField("count(distinct rd.order_id)")
+	private Integer orders;
+
+	@DbField("sum(rd.refund_fee)/100")
+	private BigDecimal refundMoney;
+}

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

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 @SearchBean(tables = "user_distribute_shared_relate_unbind unb inner join order_don o on o.user_id = unb.user_id and o.created_time > unb.update_time" +
 		" inner join user_distribute_shared us on us.user_id = unb.user_id" +
 		" inner join user_distribute ud on ud.user_id = us.shared_id and ud.deleted = 1",
-		where = "o.status not in ('close','noPayment','refund') and o.is_distribute = 0")
+		where = "o.status not in ('close','noPayment','refund') and o.is_distribute = 0 :time:")
 public class UserDistributeUnbindOrderMoneyView {
 
 

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

@@ -15,6 +15,16 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class UserOrderDetailView {
+	private Integer numOfUser;
+
+	private Integer delNumOfUser;
+
+	private Integer numOfEpOrder;
+
+	private Integer epOrderMoney;
+
+	private BigDecimal orderRate;
+
 	private Integer numOfOrder;
 
 	private BigDecimal orderMoney;

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cyksj.mapper.AccountBlockedReplaceRecordMapper">
+
+    <insert id="batchInsert">
+        insert ignore into
+        account_blocked_replace_record(`account`,`goods_id`,`created_time`,`update_time`)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.account},#{item.goodsId},now(),now())
+        </foreach>
+    </insert>
+</mapper>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.cyksj.mapper.corp.CorpCustomerAcquisitionLinkMapper">
+
+    <select id="selectActiveCodeByFollowIndx" resultType="com.cyksj.model.entity.CorpCustomerAcquisitionLink">
+        select *
+        from corp_customer_acquisition_link
+        where user_list != '[]' and
+        <foreach collection="list" item="item" separator="OR">
+            JSON_CONTAINS(user_list, '${item}')
+        </foreach>
+    </select>
+</mapper>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.cyksj.mapper.corp.CorpFollowActiveCodeMapper">
+
+    <select id="selectActiveCodeByFollowIndx" resultType="com.cyksj.model.entity.CorpFollowActiveCode">
+        select *
+        from corp_follow_active_code
+        where deleted is true
+        and follow_str != '' and
+        <foreach collection="list" item="item" separator="OR">
+            JSON_CONTAINS(follow_str, '${item}')
+        </foreach>
+    </select>
+</mapper>

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

@@ -55,7 +55,12 @@
     </select>
 
     <select id="selectCountOfCustomer" resultType="java.lang.Integer">
-        select count(distinct cufr.corp_user_id) from corp_user_tag cut left join corp_user_follow_relation cufr on cufr.id = cut.relation_id
-        where cufr.wx_corp_id = #{wxCorpId} and cut.tag_id = #{tagId}
+        select count(distinct ca.corp_user_id)
+        from corp_user_tag cut
+                 left join corp_user_follow_relation cufr
+                           on cufr.id = cut.relation_id
+                 left join corp_user_auth ca on ca.external_userid = cufr.corp_user_id
+        where cufr.wx_corp_id = #{wxCorpId}
+          and cut.tag_id = #{tagId}
     </select>
 </mapper>

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

@@ -60,4 +60,20 @@
         inner join user u on u.id = cu.user_id
         group by cu.id, cu.unionid)s order by s.tagTime desc, s.userId asc
     </select>
+
+    <select id="countTagUser" resultType="com.cyksj.model.views.UserOrderDetailView">
+        select count(distinct ca.corp_user_id) as numOfUser,
+        count(distinct if(cufr.status = 0,ca.corp_user_id,NULL)) as delNumOfUser
+        from (select relation_id
+        from `corp_user_tag` ct
+        where tag_id = #{tagIdStr}
+        <if test="startTime != null">
+            and ct.created_time >= #{startTime}
+        </if>
+        <if test="endTime != null">
+            and ct.created_time &lt; #{endTime}
+        </if>) s
+        left join corp_user_follow_relation cufr on cufr.id = s.relation_id
+        left join corp_user_auth ca on ca.external_userid = cufr.corp_user_id
+    </select>
 </mapper>

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

@@ -37,4 +37,15 @@
     <select id="selectSingleSkuIdsByGoodsId" resultType="java.lang.Long">
         select id from goods_don_sku where goods_id = #{goodsId} and num = 1
     </select>
+
+    <select id="checkAndReturnMinPriceUserOwnsSku" resultType="com.cyksj.model.entity.GoodsDonSku">
+        select id,price,months,days
+        from goods_don_sku
+        where goods_id = #{goodsId}
+        and status is true
+        and (user_owns is null
+        <if test="dsUserId != 0">
+            or JSON_CONTAINS(user_owns, '${dsUserId}')
+        </if>) order by price limit 1
+    </select>
 </mapper>

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

@@ -302,4 +302,23 @@
                 and gt.available_parking_num != 0) t
         where t.s1 >= s2
     </select>
+
+    <select id="getGroupRelationAccountView" resultType="com.cyksj.model.manage.views.GroupsRelationBackView">
+        select s.account, a.account as tripsAccount
+        from (select groups_id, account from groups_relation where id = #{relationId} limit 1) s
+                 inner join groups_trips gt on gt.id = s.groups_id
+                 left join account a on a.id = gt.account_id
+    </select>
+
+    <select id="getAreaPhoneByUserId" resultType="com.cyksj.model.entity.PhoneCode">
+        select s.phone, pc.cid
+        from (select if(login_phone != '', login_phone,
+                        (select phone
+                         from user_bind_detail
+                         where user_id = u.id
+                            or email_user_id = u.id limit 1)) as phone
+              from user u
+              where id = #{userId} limit 1) s
+                 left join phone_code pc on pc.phone = s.phone
+    </select>
 </mapper>

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

@@ -315,7 +315,9 @@
 
     <select id="getTagUserData" resultType="com.cyksj.model.views.UserOrderDetailView">
         select count(if(status != 'refund', 1, NULL)) as numOfOrder, (sum(money) - sum(ifnull(refund_money, 0))) / 100
-        as orderMoney
+        as orderMoney,
+        count(if(status != 'refund' and o.goods_id = 15,1,NULL)) as numOfEpOrder,
+        (sum(if(o.goods_id = 15,money,0)) - sum(ifnull(if(o.goods_id = 15,refund_money,0), 0))) / 100 as epOrderMoney
         from (select cu.user_id
         from (select relation_id
         from `corp_user_tag` ct
@@ -357,4 +359,34 @@
         group by date_format(o.created_time,'%Y-%m-%d')
         order by date_format(o.created_time,'%Y-%m-%d') desc
     </select>
+
+    <select id="getTagUserTimeOrderData" resultType="com.cyksj.model.views.CorpTagUserOrderDataView">
+        select o.id as order_id,o.user_id,
+        (select nickname from user u where u.id = o.user_id limit 1),
+        o.order_no,o.goods_id,g.title,o.sku_id,sku.spec_val,
+        o.money/100 as money,o.created_time
+        from (select
+        cu.user_id
+        from (select relation_id
+        from `corp_user_tag` ct
+        where tag_id = #{tagIdStr}
+        <if test="startTime != null">
+            and ct.created_time >= #{startTime}
+        </if>
+        <if test="endTime != null">
+            and ct.created_time &lt; #{endTime}
+        </if>) s
+        left join corp_user_follow_relation cufr on cufr.id = s.relation_id
+        left join corp_user_auth ca on ca.external_userid = cufr.corp_user_id
+        left join corp_user cu on cu.id = ca.corp_user_id where cu.user_id != 0) s inner join order_don o on o.user_id =
+        s.user_id
+        and o.status not in ('close', 'noPayment','refund')
+        and o.money > 0
+        <if test="toDate != null and toDate != ''">
+            and date_format(o.created_time,'%Y-%m-%d') = #{toDate}
+        </if>
+        left join goods_don g on g.id = o.goods_id
+        left join goods_don_sku sku on sku.id = o.sku_id
+        order by o.created_time desc
+    </select>
 </mapper>

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

@@ -348,7 +348,7 @@
     <select id="getMonthAmountOfOrderByType" resultType="java.math.BigDecimal">
         select ifnull((sum(o.money) - ifnull(sum(o.refund_money),0))/100,0) from `order_don` o left join `user_distribute_shared`
         us on us.user_id = o.user_Id
-        left join `user_distribute` ud on ud.user_id = us.shared_id
+        left join `user_distribute` ud on ud.user_id = us.shared_id and ud.deleted is true
         where
         <choose>
             <when test="type == 1">
@@ -368,14 +368,17 @@
     <select id="getMonthGoodsTypeAmountOfOrderByType" resultType="java.math.BigDecimal">
         select ifnull((sum(o.money) - ifnull(sum(o.refund_money),0))/100,0) from `order_don` o left join `user_distribute_shared`
         us on us.user_id = o.user_Id
-        left join `user_distribute` ud on ud.user_id = us.shared_id
+        left join `user_distribute` ud on ud.user_id = us.shared_id and ud.deleted is true
         where
         <choose>
             <when test="type == 1">
                 us.id is null
             </when>
+            <when test="type == 4">
+                us.id is not null and us.is_bind = 0
+            </when>
             <otherwise>
-                us.id is not null
+                us.id is not null and us.is_bind = 1
             </otherwise>
         </choose>
         <if test="startDate != null">
@@ -466,12 +469,13 @@
         (case
         when us.id is null then 1
         when us.id is not null and ud.id is null then 2
-        when ud.id is not null then 3
+        when ud.id is not null and us.is_bind = 1 then 3
+        when ud.id is not null and us.is_bind = 0 then 4
         else 1
         end) as `type`
         from `order_don` o
         left join `user_distribute_shared` us on us.user_id = o.user_Id
-        left join `user_distribute` ud on ud.user_id = us.shared_id
+        left join `user_distribute` ud on ud.user_id = us.shared_id and ud.deleted is true
         where status not in ('close', 'noPayment')
         <if test="startDate != null">
             and o.created_time >= #{startDate}
@@ -480,4 +484,25 @@
             and o.created_time &lt; #{endDate}
         </if>) s group by `type`
     </select>
+
+    <select id="getMonthlyUserOrderDetail" resultType="com.cyksj.model.dto.MonthlyUserOrderDetailDto">
+        select cast(((sum(money) - sum(ifnull(refund_money, 0))) / 100) as decimal(10,2)) as money,
+               count(if(`status` != 'refund', 1, NUll))          as orders,
+               1                                                    type
+        from `order_don` o
+                 left join user u on u.id = o.user_id
+
+        where o.status not in ('close', 'noPayment')
+          and o.created_time BETWEEN #{thisMonth} and #{nextMonth}
+          and u.created_time &lt; #{thisMonth}
+        union all
+        select cast(((sum(money) - sum(ifnull(refund_money, 0))) / 100) as decimal(10,2)) as money,
+               count(if(`status` != 'refund', 1, NUll))          as orders,
+               2                                                    type
+        from `order_don` o
+                 left join user u on u.id = o.user_id
+        where o.status not in ('close', 'noPayment')
+          and o.created_time BETWEEN #{thisMonth} and #{nextMonth}
+          and u.created_time BETWEEN #{thisMonth} and #{nextMonth}
+    </select>
 </mapper>

netflix-service/src/main/java/com/cyksj/common/service/CropDutyServiceDateService.java

@@ -34,7 +34,7 @@ public class CropDutyServiceDateService {
 	/**
 	 * 返回明天星期几 用户获取对应周期工作客服
 	 */
-	public static List<YhServiceDto> getDutyService(DayOfWeek nextWorkDay, List<YhServiceDto> workday, List<YhServiceDto> sunday, List<YhServiceDto> saturday, Map<String, List<YhServiceDto>> holidyDateMap, LocalDateTime now) {
+	public static List<YhServiceDto> getDutyService(DayOfWeek nextWorkDay, List<YhServiceDto> workday, List<YhServiceDto> saturday, List<YhServiceDto> sunday, Map<String, List<YhServiceDto>> holidyDateMap, LocalDateTime now) {
 		List<YhServiceDto> holidayServiceIfHoliday = getHolidayServiceIfHoliday(now, holidyDateMap);
 		if (holidayServiceIfHoliday != null) {
 			return holidayServiceIfHoliday;

netflix-service/src/main/java/com/cyksj/service/corp/CorpFollowDynamicConfigService.java

@@ -13,7 +13,7 @@ import java.util.List;
 public interface CorpFollowDynamicConfigService {
 	String corpFollowContactConfig(CorpFollowContact corpFollowContact) throws Exception;
 
-	String createCorpFollowActiveCode(List<String> followIds, String state, Boolean isDuty) throws Exception;
+	String createCorpFollowActiveCode(List<String> followIds, List<Integer> userIndxList, String state, Boolean isDuty) throws Exception;
 
 	void updateCorpFollowActiveCode(String oldMarkTag, String markTag) throws Exception;
 }

netflix-service/src/main/java/com/cyksj/service/corp/CorpMsgFollowAssociationService.java

@@ -0,0 +1,11 @@
+package com.cyksj.service.corp;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cyksj.model.entity.CorpMsgFollowAssociation;
+
+/**
+ * @author chan
+ * @date 2024/1/18 16:16
+ */
+public interface CorpMsgFollowAssociationService extends IService<CorpMsgFollowAssociation> {
+}

netflix-service/src/main/java/com/cyksj/service/corp/CorpQyMsgContentService.java

@@ -0,0 +1,13 @@
+package com.cyksj.service.corp;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cyksj.model.entity.QyMsgContent;
+import com.cyksj.model.manage.views.CorpFollowMsgView;
+import com.ejlchina.searcher.SearchResult;
+
+/**
+ * @author chan
+ * @date 2024/1/22 15:07
+ */
+public interface CorpQyMsgContentService extends IService<QyMsgContent> {
+}

netflix-service/src/main/java/com/cyksj/service/corp/CorpTagService.java

@@ -46,4 +46,6 @@ public interface CorpTagService {
 	CorpTagGroupView addGroup(CorpTagGroupView tagGroup) throws Exception;
 
 	UserOrderDetailView getTagUserData(Integer start, Integer limit, String tagIdStr, String startTime, String endTime);
+
+	Page<CorpTagUserOrderDataView> getTagUserTimeOrderData(Integer start, Integer limit, String tagIdStr, String toDate, String startTime, String endTime);
 }

netflix-service/src/main/java/com/cyksj/service/corp/WxCorpOps.java

@@ -177,4 +177,9 @@ public interface WxCorpOps {
 	 * 删除获客链接
 	 */
 	WxCpLinkAddResp customerAcquisitionDeleteLink(String corpId, WxCpLinkUpd wxCpLinkUpd) throws Exception;
+
+	/**
+	 * 获取会话内容存档开启成员列表
+	 */
+	List<String> getPermitUserList(String corpId, String type) throws Exception;
 }

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

@@ -1,11 +1,11 @@
 package com.cyksj.service.corp.impl;
 
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.util.Jsons;
 import com.cyksj.mapper.corp.CorpCustomerAcquisitionLinkMapper;
 import com.cyksj.mapper.corp.CorpCustomerAcquisitionLinkPopularizeMapper;
 import com.cyksj.model.entity.CorpCustomerAcquisitionLink;
@@ -16,6 +16,7 @@ import com.cyksj.model.request.corp.link.WxCpLinkAddResp;
 import com.cyksj.model.request.corp.link.WxCpLinkUpd;
 import com.cyksj.service.corp.CorpCustomerAcquisitionLinkService;
 import com.cyksj.service.corp.WxCorpOps;
+import com.cyksj.service.sys.SysCorpServiceRelateService;
 import com.cyksj.xxljob.XxlJobInfo;
 import com.cyksj.xxljob.XxlJobUtil;
 import lombok.RequiredArgsConstructor;
@@ -23,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -38,6 +40,8 @@ public class CorpCustomerAcquisitionLinkServiceImpl extends ServiceImpl<CorpCust
 
     private final CorpCustomerAcquisitionLinkPopularizeMapper corpCustomerAcquisitionLinkPopularizeMapper;
 
+    private final SysCorpServiceRelateService sysCorpServiceRelateService;
+
     @Override
     @Transactional(rollbackFor = Throwable.class)
     public void add(CorpCustomerAcquisitionLink corpCustomerAcquisitionLink) throws Exception {
@@ -45,7 +49,10 @@ public class CorpCustomerAcquisitionLinkServiceImpl extends ServiceImpl<CorpCust
         wxCpLinkAdd.setLinkName(corpCustomerAcquisitionLink.getLinkName());
         wxCpLinkAdd.setSkipVerify(corpCustomerAcquisitionLink.getSkipVerify());
         Range range = new Range();
-        range.setUserList(JSONUtil.parseArray(corpCustomerAcquisitionLink.getUserList()).toList(String.class));
+        String userList = corpCustomerAcquisitionLink.getUserList();
+        //值班客服
+        List<String> followIds = sysCorpServiceRelateService.getFollowIdsByRelateIds(Jsons.parseList(userList, Integer.class));
+        range.setUserList(followIds);
         wxCpLinkAdd.setRange(range);
         WxCpLinkAddResp wxCpLinkAddResp = corpOps.customerAcquisitionCreateLink(null, wxCpLinkAdd);
         corpCustomerAcquisitionLink.setUrl(wxCpLinkAddResp.getLink().getUrl());
@@ -72,7 +79,15 @@ public class CorpCustomerAcquisitionLinkServiceImpl extends ServiceImpl<CorpCust
         wxCpLinkUpd.setLinkId(corpCustomerAcquisitionLink.getLinkId());
         wxCpLinkUpd.setSkipVerify(corpCustomerAcquisitionLink.getSkipVerify());
         Range range = new Range();
-        range.setUserList(JSONUtil.parseArray(corpCustomerAcquisitionLink.getUserList()).toList(String.class));
+        String userList;
+        if (link.getIsDuty()) {
+            userList = corpCustomerAcquisitionLink.getChooseDutyUsers();
+        } else {
+            userList = corpCustomerAcquisitionLink.getUserList();
+        }
+        //值班客服
+        List<String> followIds = sysCorpServiceRelateService.getFollowIdsByRelateIds(Jsons.parseList(userList, Integer.class));
+        range.setUserList(followIds);
         wxCpLinkUpd.setRange(range);
 
         WxCpLinkAddResp wxCpLinkAddResp = corpOps.customerAcquisitionUpdateLink(null, wxCpLinkUpd);
@@ -83,10 +98,8 @@ public class CorpCustomerAcquisitionLinkServiceImpl extends ServiceImpl<CorpCust
         Boolean isDuty = Optional.ofNullable(corpCustomerAcquisitionLink.getIsDuty()).orElse(false);
         if (!isDuty) {
             corpCustomerAcquisitionLink.setChooseDutyUsers(null);
-        } else {
-            if (StrUtil.isEmpty(corpCustomerAcquisitionLink.getChooseDutyUsers())) {
-                corpCustomerAcquisitionLink.setChooseDutyUsers(corpCustomerAcquisitionLink.getUserList());
-            }
+        } else if (StrUtil.isEmpty(corpCustomerAcquisitionLink.getChooseDutyUsers())) {
+            corpCustomerAcquisitionLink.setChooseDutyUsers(corpCustomerAcquisitionLink.getUserList());
         }
 
         this.updateById(corpCustomerAcquisitionLink);

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

@@ -2,7 +2,6 @@ package com.cyksj.service.corp.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.snowflake.Sequence;
 import com.cyksj.common.util.Jsons;
@@ -16,6 +15,7 @@ import com.cyksj.redis.RedisService;
 import com.cyksj.service.corp.CorpCustomerAcquistionService;
 import com.cyksj.service.corp.WxCorpOps;
 import com.cyksj.service.sys.SysConfigService;
+import com.cyksj.service.sys.SysCorpServiceRelateService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -45,6 +45,8 @@ public class CorpCustomerAcquistionServiceImpl implements CorpCustomerAcquistion
 
     private final SysConfigService sysConfigService;
 
+    private final SysCorpServiceRelateService sysCorpServiceRelateService;
+
     private final WxCorpOps corpOps;
 
 
@@ -94,9 +96,9 @@ public class CorpCustomerAcquistionServiceImpl implements CorpCustomerAcquistion
         if (corpCustomerAcquisitionLink.getIsDuty()) {
             String userList = corpCustomerAcquisitionLink.getUserList();
 
-            List<String> users = Jsons.parseList(userList, String.class);
+            List<Integer> users = Jsons.parseList(userList, Integer.class);
             if (users.size() > 1) {
-                List<String> dutyServices = sysConfigService.getDutyServices();
+                List<Integer> dutyServices = sysConfigService.getDutyServices();
                 //值班
                 if (CollUtil.isNotEmpty(dutyServices)) {
 
@@ -104,9 +106,9 @@ public class CorpCustomerAcquistionServiceImpl implements CorpCustomerAcquistion
                     if (chooseDutyUsers == null) {
                         chooseDutyUsers = userList;
                     }
-                    List<String> chooseUserList = Jsons.parseList(chooseDutyUsers, String.class);
+                    List<Integer> chooseUserList = Jsons.parseList(chooseDutyUsers, Integer.class);
 
-                    Set<String> fitUsers = dutyServices.stream().filter(e -> users.contains(e)).collect(Collectors.toSet());
+                    Set<Integer> fitUsers = dutyServices.stream().filter(e -> users.contains(e)).collect(Collectors.toSet());
                     if (CollUtil.isNotEmpty(fitUsers) && (fitUsers.size() != chooseUserList.size() || !chooseUserList.containsAll(fitUsers))) {
 
                         corpCustomerAcquisitionLink.setChooseDutyUsers(Jsons.toJson(fitUsers));
@@ -117,7 +119,10 @@ public class CorpCustomerAcquistionServiceImpl implements CorpCustomerAcquistion
                         wxCpLinkUpd.setLinkId(corpCustomerAcquisitionLink.getLinkId());
                         wxCpLinkUpd.setSkipVerify(corpCustomerAcquisitionLink.getSkipVerify());
                         Range range = new Range();
-                        range.setUserList(JSONUtil.parseArray(corpCustomerAcquisitionLink.getChooseDutyUsers()).toList(String.class));
+                        List<Integer> userIndxList = Jsons.parseList(corpCustomerAcquisitionLink.getChooseDutyUsers(), Integer.class);
+                        List<String> followIds = sysCorpServiceRelateService.getFollowIdsByRelateIds(userIndxList);
+
+                        range.setUserList(followIds);
                         wxCpLinkUpd.setRange(range);
                         corpOps.customerAcquisitionUpdateLink(null, wxCpLinkUpd);
 

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

@@ -723,9 +723,7 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 		//加粉深度回传逻辑.
 		if(StrUtil.isNotBlank(message.getState()) && message.getState().contains(Constant.ACQUISTION_LINK_STATE_KEY)){
 			String customer = message.getState().replaceAll("customer_", "");
-			THREAD_POOL.execute(()->{
-				saveAcqusitionCallback(customer, corpUser, message);
-			});
+			saveAcqusitionCallback(customer, corpUser, message);
 			isSendWelcomeMsg.set(true);
 		}
 
@@ -1020,18 +1018,20 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 		Long linkId = customerAcquisitionSaveClickId(customer, corpUser.getUnionid());
 		CorpCustomerAcquisitionLink customerAcquisitionLink;
 		if (linkId != null) {
+			log.info("加粉链接linkid:{}", linkId);
 			customerAcquisitionLink = corpCustomerAcquisitionLinkMapper.getByLinkPopularizeId(linkId);
 		} else {
 			//直接使用获客链接
 			customerAcquisitionLink = corpCustomerAcquisitionLinkMapper.selectById(customer);
 		}
 		if (customerAcquisitionLink == null) {
+			log.info("未找到对应获客链接:{}", customer);
 			return;
 		}
 		corpUser.setCustomerAcquisitionLinkId(customerAcquisitionLink.getId());
 		if (StringUtils.isNotBlank(customerAcquisitionLink.getTags())){
 			try {
-				log.info("处理获客链接客户标签");
+				log.info("处理获客链接客户标签,标签id:{}", customerAcquisitionLink.getTags());
 				List<Long> tags = Jsons.parseList(customerAcquisitionLink.getTags(), Long.class);
 				if (CollectionUtil.isEmpty(tags)) {
 					log.info("获客链接id为：{},无标签处理", customerAcquisitionLink.getId());

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

@@ -91,19 +91,19 @@ public class CorpFollowActiveCodeFrontServiceImpl implements CorpFollowActiveCod
 		if (activeCodeDtos.size() == 1) {
 			return activeCodeDtos.get(0).getQrCode();
 		}
-		List<String> dutyServices = sysConfigService.getDutyServices();
-		String chooseFollowId = null;
+		List<Integer> dutyServices = sysConfigService.getDutyServices();
+		Integer chooseFollowId = null;
 		//值班
 		if (CollUtil.isNotEmpty(dutyServices)) {
-			List<String> collectFollow = new ArrayList<>();
+			List<Integer> collectFollow = new ArrayList<>();
 			activeCodeDtos.stream().forEach(e -> {
 				try {
-					collectFollow.addAll(JSONUtil.parseArray(e.getFollowIds()).toList(String.class));
+					collectFollow.addAll(JSONUtil.parseArray(e.getUserIndxList()).toList(Integer.class));
 				} catch (Exception ex) {
 					System.out.println(ex.getMessage());
 				}
 			});
-			List<String> collect = dutyServices.stream().filter(fid -> collectFollow.contains(fid)).collect(Collectors.toList());
+			List<Integer> collect = dutyServices.stream().filter(fid -> collectFollow.contains(fid)).collect(Collectors.toList());
 			if (CollUtil.isNotEmpty(collect)) {
 				chooseFollowId = collect.get(RandomUtil.randomInt(collect.size()));
 			}
@@ -112,8 +112,14 @@ public class CorpFollowActiveCodeFrontServiceImpl implements CorpFollowActiveCod
 		CorpFollowActiveCodeDto activeCodeDto = null;
 		if (chooseFollowId != null) {
 			log.info("寻找合适值班客服:{}", chooseFollowId);
-			final String csFollowId = chooseFollowId;
-			activeCodeDto = activeCodeDtos.stream().filter(active -> active.getFollowIds().contains(csFollowId)).findFirst().get();
+			final Integer csFollowId = chooseFollowId;
+			activeCodeDto = activeCodeDtos.stream().filter(active -> {
+				try {
+					return Jsons.parseList(active.getUserIndxList(), Integer.class).contains(csFollowId);
+				} catch (Exception e) {
+				}
+				return false;
+			}).findFirst().get();
 		}
 
 		if (activeCodeDto == null) {

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

@@ -62,7 +62,7 @@ public class CorpFollowDynamicConfigServiceImpl implements CorpFollowDynamicConf
 	}
 
 	@Override
-	public String createCorpFollowActiveCode(List<String> followIds, String state, Boolean isDuty) throws Exception {
+	public String createCorpFollowActiveCode(List<String> followIds, List<Integer> userIndxList, String state, Boolean isDuty) throws Exception {
 		List<CorpFollowActiveCodeDto> codeList = new ArrayList<>();
 		SysConfig sysConfig = sysConfigMapper.selectOne(Wrappers.lambdaQuery(SysConfig.class)
 				.eq(SysConfig::getSysKey, Constant.serviceKeys.get(1)).last("limit 1"));
@@ -84,7 +84,7 @@ public class CorpFollowDynamicConfigServiceImpl implements CorpFollowDynamicConf
 			if (StrUtil.isEmpty(serviceNames)) {
 				throw BusinessRuntimeException.getInstance("存在被删除的客服,请刷新页面重试");
 			}
-			CorpFollowActiveCodeDto corpFollowActiveCodeDto = createCorpFollowActiveCode(followIds, state, type, serviceNames);
+			CorpFollowActiveCodeDto corpFollowActiveCodeDto = createCorpFollowActiveCode(followIds, userIndxList, state, type, serviceNames);
 			codeList.add(corpFollowActiveCodeDto);
 		} else {
 			Map<String, List<CorpFollowServiceDto>> csMap = null;
@@ -95,7 +95,8 @@ public class CorpFollowDynamicConfigServiceImpl implements CorpFollowDynamicConf
 				throw BusinessRuntimeException.getInstance("存在被删除的客服,请刷新页面重试");
 			}
 			for (String followId : followIds) {
-				CorpFollowActiveCodeDto corpFollowActiveCodeDto = createCorpFollowActiveCode(List.of(followId), state, type, csMap.get(followId).get(0).getName());
+				CorpFollowServiceDto corpFollowServiceDto = csMap.get(followId).get(0);
+				CorpFollowActiveCodeDto corpFollowActiveCodeDto = createCorpFollowActiveCode(List.of(followId), List.of(corpFollowServiceDto.getIndx()), state, type, corpFollowServiceDto.getName());
 				codeList.add(corpFollowActiveCodeDto);
 			}
 		}
@@ -117,7 +118,7 @@ public class CorpFollowDynamicConfigServiceImpl implements CorpFollowDynamicConf
 		}
 	}
 
-	public CorpFollowActiveCodeDto createCorpFollowActiveCode(List<String> followIds, String state, Integer type, String serviceName) throws Exception {
+	public CorpFollowActiveCodeDto createCorpFollowActiveCode(List<String> followIds, List<Integer> userIndxList, String state, Integer type, String serviceName) throws Exception {
 		CorpFollowContact c = new CorpFollowContact();
 		c.setType(type);
 		c.setScene(2);
@@ -131,6 +132,7 @@ public class CorpFollowDynamicConfigServiceImpl implements CorpFollowDynamicConf
 		String configId = jsonObject.getStr("config_id");
 		CorpFollowActiveCodeDto corpFollowActiveCodeDto = new CorpFollowActiveCodeDto();
 		corpFollowActiveCodeDto.setFollowIds(followIds.toString());
+		corpFollowActiveCodeDto.setUserIndxList(userIndxList.toString());
 		corpFollowActiveCodeDto.setServiceNames(serviceName);
 		corpFollowActiveCodeDto.setQrCode(qrCode);
 		corpFollowActiveCodeDto.setConfigId(configId);

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

@@ -19,6 +19,7 @@ import com.cyksj.service.corp.CorpFollowDynamicConfigService;
 import com.cyksj.service.corp.CorpFollowService;
 import com.cyksj.service.corp.WxCorpOps;
 import com.cyksj.service.mange.cms.CmsUserManager;
+import com.cyksj.service.sys.SysCorpServiceRelateService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
@@ -51,6 +52,8 @@ public class CorpFollowServiceImpl implements CorpFollowService {
 
 	private final RedisService redisService;
 
+	private final SysCorpServiceRelateService sysCorpServiceRelateService;
+
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
 	public void postActiveCode(Long adminId, CorpFollowActiveCode activeCode) throws Exception {
@@ -59,11 +62,13 @@ public class CorpFollowServiceImpl implements CorpFollowService {
 			activeCode.setOperator(cmsUser.getNickname());
 		}
 		Boolean isDuty = Optional.ofNullable(activeCode.getIsDuty()).orElse(false);
-		List<String> followIds = activeCode.getFollowIds();
-		if (CollUtil.isEmpty(followIds)) {
+		List<Integer> userIndxList = activeCode.getUserIndxList();
+
+		if (CollUtil.isEmpty(userIndxList)) {
 			throw BusinessRuntimeException.getInstance("请选择对应客服");
 		}
-		activeCode.setFollowStr(Jsons.toJson(followIds));
+		activeCode.setFollowStr(Jsons.toJson(userIndxList));
+		List<String> followStrList = sysCorpServiceRelateService.getFollowIdsByRelateIds(userIndxList);
 		activeCode.setMarkTag(activeCode.getMarkTag().trim());
 		String text = activeCode.getText();
 		if (StrUtil.isNotBlank(text) && text.length() > 4000) {
@@ -83,9 +88,9 @@ public class CorpFollowServiceImpl implements CorpFollowService {
 		}
 		if (!isDuty) {
 			//生成一个活码 一个客服或多个客服
-			codeStr = corpFollowDynamicConfigService.createCorpFollowActiveCode(followIds, Constant.AC_CODE_KEY + activeCode.getId(), isDuty);
+			codeStr = corpFollowDynamicConfigService.createCorpFollowActiveCode(followStrList, userIndxList, Constant.AC_CODE_KEY + activeCode.getId(), isDuty);
 		} else {
-			codeStr = corpFollowDynamicConfigService.createCorpFollowActiveCode(followIds, Constant.AC_CODE_KEY + activeCode.getId(), isDuty);
+			codeStr = corpFollowDynamicConfigService.createCorpFollowActiveCode(followStrList, userIndxList, Constant.AC_CODE_KEY + activeCode.getId(), isDuty);
 		}
 		activeCode.setCodeStr(codeStr);
 		corpFollowActiveCodeMapper.updateById(activeCode);
@@ -102,22 +107,23 @@ public class CorpFollowServiceImpl implements CorpFollowService {
 			throw BusinessRuntimeException.getInstance("对应的数据已不存在");
 		}
 		String db_followStr = dbActiveCode.getFollowStr();
-		List<String> up_corpFollows = activeCode.getFollowIds();
-		if (CollUtil.isEmpty(up_corpFollows)) {
+		List<Integer> upUserIndxList = activeCode.getUserIndxList();
+		if (CollUtil.isEmpty(upUserIndxList)) {
 			throw BusinessRuntimeException.getInstance("请选择对应客服");
 		}
-		activeCode.setFollowStr(Jsons.toJson(up_corpFollows));
+		activeCode.setFollowStr(Jsons.toJson(upUserIndxList));
+		List<String> up_followStrList = sysCorpServiceRelateService.getFollowIdsByRelateIds(upUserIndxList);
 		if (StrUtil.isEmpty(activeCode.getMarkTag())) {
 			throw BusinessRuntimeException.getInstance("请输入标签");
 		}
-		List<String> db_followIds = Jsons.parseList(db_followStr, String.class);
+		List<Integer> db_followIds = Jsons.parseList(db_followStr, Integer.class);
 		Boolean isReCreateAcCode = false;
 		Boolean isUpdateAcCode = false;
-		if (db_followIds.size() != up_corpFollows.size()) {
+		if (db_followIds.size() != upUserIndxList.size()) {
 			isReCreateAcCode = true;
 		}
 		if (!isReCreateAcCode) {
-			for (String upFollowId : up_corpFollows) {
+			for (Integer upFollowId : upUserIndxList) {
 				if (!db_followIds.contains(upFollowId)) {
 					isReCreateAcCode = true;
 					break;
@@ -143,7 +149,7 @@ public class CorpFollowServiceImpl implements CorpFollowService {
 
 		//重新构建活码配置
 		if (isReCreateAcCode) {
-			String code_str = corpFollowDynamicConfigService.createCorpFollowActiveCode(up_corpFollows, Constant.AC_CODE_KEY + activeCode.getId(), up_isDuty);
+			String code_str = corpFollowDynamicConfigService.createCorpFollowActiveCode(up_followStrList, upUserIndxList, Constant.AC_CODE_KEY + activeCode.getId(), up_isDuty);
 			activeCode.setCodeStr(code_str);
 			Set<String> keys = redisService.keys(RedisService.key.CORP_FOLLOW_ACTIVE_CODE_KEY.getNameFormat(activeCode.getId(), "*"));
 			redisService.del(keys.toArray(String[]::new));

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

@@ -0,0 +1,15 @@
+package com.cyksj.service.corp.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cyksj.mapper.corp.CorpMsgFollowAssociationMapper;
+import com.cyksj.model.entity.CorpMsgFollowAssociation;
+import com.cyksj.service.corp.CorpMsgFollowAssociationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author chan
+ * @date 2024/1/18 16:18
+ */
+@Service
+public class CorpMsgFollowAssociationServiceImpl extends ServiceImpl<CorpMsgFollowAssociationMapper, CorpMsgFollowAssociation> implements CorpMsgFollowAssociationService {
+}

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

@@ -0,0 +1,28 @@
+package com.cyksj.service.corp.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cyksj.mapper.corp.QyMsgContentMapper;
+import com.cyksj.model.entity.QyMsgContent;
+import com.cyksj.model.manage.views.CorpFollowMsgView;
+import com.cyksj.service.corp.CorpQyMsgContentService;
+import com.ejlchina.searcher.BeanSearcher;
+import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.util.MapBuilder;
+import com.ejlchina.searcher.util.MapUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author chan
+ * @date 2024/1/22 15:08
+ */
+@RequiredArgsConstructor
+@Service
+@Slf4j
+public class CorpQyMsgContentServiceImpl extends ServiceImpl<QyMsgContentMapper, QyMsgContent> implements CorpQyMsgContentService {
+
+    private final BeanSearcher beanSearcher;
+
+}

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

@@ -258,12 +258,16 @@ public class CorpServiceImpl implements CorpService {
 		WxCorpApp wxCorpApp = WeChatCorpFactory.getCorpConfigStrategy(corpId);
 		Long wxCorpId = wxCorpApp.getId();
 		CorpFollow corpFollow = corpFollowMapper.selectOne(Wrappers.lambdaQuery(CorpFollow.class).eq(CorpFollow::getWxCorpId, wxCorpId).eq(CorpFollow::getUserid, corpOauth2UserInfo.getUserId()));
+		CorpUserInfo userInfo = wxCorpOps.getFollowUser(corpId, corpOauth2UserInfo.getUserId());
 		if (corpFollow == null) {
-			CorpUserInfo userInfo = wxCorpOps.getFollowUser(corpId, corpOauth2UserInfo.getUserId());
 			corpFollow = new CorpFollow();
 			BeanUtil.copyProperties(userInfo, corpFollow);
 			corpFollow.setWxCorpId(wxCorpId);
 			corpFollowMapper.insert(corpFollow);
+		}else {
+			BeanUtil.copyProperties(userInfo, corpFollow);
+			corpFollow.setWxCorpId(wxCorpId);
+			corpFollowMapper.updateById(corpFollow);
 		}
 
 		return corpFollow;

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

@@ -24,6 +24,8 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -422,9 +424,20 @@ public class CorpTagServiceImpl implements CorpTagService {
 	public UserOrderDetailView getTagUserData(Integer start, Integer limit, String tagIdStr, String startTime, String endTime) {
 		UserOrderDetailView u = orderDonMapper.getTagUserData(tagIdStr, startTime, endTime);
 
+		UserOrderDetailView u2 = corpUserTagMapper.countTagUser(tagIdStr, startTime, endTime);
+
+		u.setNumOfUser(u2.getNumOfUser());
+		u.setDelNumOfUser(u2.getDelNumOfUser());
+		u.setOrderRate(u.getNumOfUser() == 0 ? BigDecimal.ZERO : BigDecimal.valueOf(u.getNumOfEpOrder()).divide(BigDecimal.valueOf(u.getNumOfUser()), 2, RoundingMode.HALF_DOWN));
 		Page<UserOrderDetailView> records = orderDonMapper.getTagUserDataPage(new Page<>(start, limit), tagIdStr, startTime, endTime);
 
 		u.setRecords(records);
 		return u;
 	}
+
+	@Override
+	public Page<CorpTagUserOrderDataView> getTagUserTimeOrderData(Integer start, Integer limit, String tagIdStr, String toDate, String startTime, String endTime) {
+		Page<CorpTagUserOrderDataView> records = orderDonMapper.getTagUserTimeOrderData(new Page<>(start, limit), tagIdStr, toDate, startTime, endTime);
+		return records;
+	}
 }

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

@@ -740,7 +740,7 @@ public class WxCorpOpsImpl implements WxCorpOps {
 
 	@Override
 	public WxCpLinkAddResp customerAcquisitionDeleteLink(String corpId, WxCpLinkUpd wxCpLinkUpd) throws Exception {
-		String url = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/delete_link?access_token=" + getAccessToken(corpId);
+		String url = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/delete_link?access_token=";
 
 		HttpResponse<String> res =
 				J11HttpC.custom()
@@ -759,4 +759,30 @@ public class WxCorpOpsImpl implements WxCorpOps {
 		}
 		return resp;
 	}
+
+	@Override
+	public List<String> getPermitUserList(String corpId, String type) throws Exception {
+		String url = "https://qyapi.weixin.qq.com/cgi-bin/msgaudit/get_permit_user_list?access_token=" + getAccessToken(corpId);
+
+		JSONObject params = new JSONObject();
+		if (StringUtils.isNotBlank(type)) {
+			params.putOpt("type",type);
+		}
+		HttpResponse<String> res =
+				J11HttpC.custom()
+						.ofPost()
+						.url(url)
+						.headers(J11HttpC.ReqType.raw_json)
+						.body(HttpRequest.BodyPublishers.ofString(Jsons.toJson(params), IoKit.Charsets.UTF_8.getCharset()))
+						.send(HttpResponse.BodyHandlers.ofString());
+		if (200 != res.statusCode()) {
+			throw BusinessRuntimeException.getInstance("获取会话内容存档开启成员列表: " + res.body());
+		}
+
+		CorpBaseResult resp = Jsons.parseObject(res.body(), CorpBaseResult.class);
+		if (resp.getErrcode() != 0) {
+			throw BusinessRuntimeException.getInstance("获取会话内容存档开启成员列表: " + resp.getErrmsg());
+		}
+		return JSONUtil.parseObj(res.body()).getJSONArray("ids").toList(String.class);
+	}
 }

netflix-service/src/main/java/com/cyksj/service/mange/CmsAccountService.java

@@ -51,4 +51,6 @@ public interface CmsAccountService extends IService<Account> {
 	void analysisAmericaAppidAccount(Long goodsId, Long skuId, List<Object> accountList);
 
 	void readFileAndImportEmail(MultipartFile file) throws Exception;
+
+	void batchImportBlockedAccount(Long goodsId, List<Object> accountBlockedList);
 }

netflix-service/src/main/java/com/cyksj/service/mange/account/CmsAccountServiceImpl.java

@@ -1,9 +1,11 @@
 package com.cyksj.service.mange.account;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,11 +13,13 @@ import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.StringUtil;
+import com.cyksj.mapper.AccountBlockedReplaceRecordMapper;
 import com.cyksj.mapper.AccountMapper;
 import com.cyksj.mapper.AccountUpdatePasswordRecordMapper;
-import com.cyksj.mapper.sys.SysEmailMapper;
+import com.cyksj.mapper.GoodsDonMapper;
 import com.cyksj.mapper.manage.AutoUpdateAccountPwdLogMapper;
 import com.cyksj.mapper.manage.cms.CmsUserMapper;
+import com.cyksj.mapper.sys.SysEmailMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.excel.ExcelAccountData;
 import com.cyksj.model.manage.views.AccountView;
@@ -69,6 +73,10 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
 
 	private final SysEmailMapper sysEmailMapper;
 
+	private final GoodsDonMapper goodsDonMapper;
+
+	private final AccountBlockedReplaceRecordMapper accountBlockedReplaceRecordMapper;
+
 	@Override
 	public IPage<ExpiredAccountDataView> getExpiredAccountView(Boolean isCorpWx, String customerService, Long goodsId, Long skuId, String account, Boolean renewStatus, Boolean handleStatus, String cnAccount, String usAccount, Integer userId, String startTime, String endTime, String now, Long offset, Long limit) {
 		return accountMapper.getExpiredAccountView(isCorpWx, customerService, goodsId, skuId, account, renewStatus, handleStatus, cnAccount, usAccount, userId, startTime, endTime, now, new Page<>(offset, limit));
@@ -379,4 +387,29 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
 		groupsTrips.setAccountId(accountId);
 		cmsGroupService.issuance(groupsTrips, null);
 	}
+
+	@Override
+	public void batchImportBlockedAccount(Long goodsId, List<Object> accountBlockedList) {
+		GoodsDon goodsDon = goodsDonMapper.selectById(goodsId);
+		Assert.notNull(goodsDon, "平台不存在");
+		List<AccountBlockedReplaceRecord> list = new ArrayList<>();
+		accountBlockedList.forEach(accountBlocked->{
+			Map<String, Object> map = Jsons.toMap(accountBlocked);
+			String blockedAccount = map.get("0").toString();
+			if (!Validator.isEmail(blockedAccount)) {
+				return;
+			}
+			AccountBlockedReplaceRecord accountBlockedReplaceRecord = new AccountBlockedReplaceRecord();
+			accountBlockedReplaceRecord.setGoodsId(goodsId);
+			accountBlockedReplaceRecord.setAccount(blockedAccount);
+			list.add(accountBlockedReplaceRecord);
+			if (list.size() == 400) {
+				accountBlockedReplaceRecordMapper.batchInsert(list);
+				list.clear();
+			}
+		});
+		if (list.size() > 0) {
+			accountBlockedReplaceRecordMapper.batchInsert(list);
+		}
+	}
 }

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonServiceImpl.java

@@ -12,7 +12,6 @@ import com.ejlchina.searcher.BeanSearcher;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
 
@@ -36,15 +35,28 @@ public class CmsGoodsDonServiceImpl extends ServiceImpl<GoodsDonMapper, GoodsDon
 				.eq(GoodsDonSku::getGoodsId, goodsId)
 				.eq(GoodsDonSku::getStatus, true)
 				.orderByAsc(GoodsDonSku::getPrice));
-		//是否有特定价格规格
-		if (goods.getIsSp() && CollUtil.isEmpty(skuViews)) {
-			goods.setIsSp(false);
+		//是否有特殊属性
+		if (CollUtil.isEmpty(skuViews)) {
+			if (goods.getIsSp()) {
+				goods.setIsSp(false);
+			}
+			if (goods.getIsOwns()) {
+				goods.setIsOwns(false);
+			}
 			goodsDonMapper.updateById(goods);
 		}
 		if (!skuViews.isEmpty()) {
 			//是否有特定价格规格
-			Optional<GoodsDonSku> specificSkuAny = skuViews.stream().filter(sku -> sku.getSpecificPrice().compareTo(BigDecimal.ZERO) > 0).findAny();
-			goods.setIsSp(specificSkuAny.isPresent() ? true : false);
+			int spSkuCount = goodsDonSkuMapper.selectCount(Wrappers.lambdaQuery(GoodsDonSku.class)
+					.eq(GoodsDonSku::getGoodsId, goodsId)
+					.gt(GoodsDonSku::getSpecificPrice, 0)
+					.eq(GoodsDonSku::getStatus, true));
+			int userOwnsSkuCount = goodsDonSkuMapper.selectCount(Wrappers.lambdaQuery(GoodsDonSku.class)
+					.eq(GoodsDonSku::getGoodsId, goodsId)
+					.isNotNull(GoodsDonSku::getUserOwns)
+					.eq(GoodsDonSku::getStatus, true));
+			goods.setIsSp(spSkuCount > 0 ? true : false);
+			goods.setIsOwns(userOwnsSkuCount > 0 ? true : false);
 
 			GoodsDonSku min = skuViews.get(0);
 			goods.setMinPrice(min.getPrice());

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonSpecServiceImpl.java

@@ -245,16 +245,28 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 			String specificGoodsIds = goodsDonSku.getSpecificGoodsIds();
 			if (StrUtil.isNotBlank(specificGoodsIds)) {
 				Set<Long> specificGids = Jsons.parseSet(specificGoodsIds, Long.class);
-				Integer count = goodsDonMapper.selectCount(Wrappers.lambdaQuery(GoodsDon.class)
-						.in(GoodsDon::getId, specificGids)
-						.eq(GoodsDon::getStatus, true)
-						.eq(GoodsDon::getDeleted, true));
-				if (count != specificGids.size()) {
-					throw BusinessRuntimeException.getInstance("存在被删除或已下架的平台");
+				if (specificGids.isEmpty()) {
+					goodsDonSku.setSpecificPrice(BigDecimal.ZERO);
+				} else {
+					Integer count = goodsDonMapper.selectCount(Wrappers.lambdaQuery(GoodsDon.class)
+							.in(GoodsDon::getId, specificGids)
+							.eq(GoodsDon::getStatus, true)
+							.eq(GoodsDon::getDeleted, true));
+					if (count != specificGids.size()) {
+						throw BusinessRuntimeException.getInstance("存在被删除或已下架的平台");
+					}
+					BigDecimal specificPrice = goodsDonSku.getSpecificPrice();
+					if (specificPrice == null || specificPrice.compareTo(BigDecimal.ZERO) <= 0) {
+						throw BusinessRuntimeException.getInstance("请输入正确的特定价格");
+					}
 				}
-				BigDecimal specificPrice = goodsDonSku.getSpecificPrice();
-				if (specificPrice == null || specificPrice.compareTo(BigDecimal.ZERO) <= 0) {
-					throw BusinessRuntimeException.getInstance("请输入正确的特定价格");
+			}
+			if (StrUtil.isNotEmpty(goodsDonSku.getUserOwns())) {
+				List<Long> userOwnsList = Jsons.parseList(goodsDonSku.getUserOwns(), Long.class);
+				if (CollUtil.isEmpty(userOwnsList)) {
+					goodsDonSku.setUserOwns(null);
+				} else {
+					goodsDonSku.setUserOwns(userOwnsList.toString());
 				}
 			}
 			goodsDonSkuMapper.insert(goodsDonSku);

netflix-service/src/main/java/com/cyksj/service/mange/group/CmsGroupServiceImpl.java

@@ -191,7 +191,6 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
         if (trips != null && StrUtil.isNotBlank(trips.getTitle())) {
             title = trips.getTitle();
         }
-        String msg = String.format(Constant.CHANGE_GROUPS_TRIPS_ACCOUNT, title);
         //配置midJourney安全码
         String verifyCodes = groupsTrips.getVerifyCodes();
         List<String> verifyCodeList = null;
@@ -241,7 +240,7 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
             }
             if (relation.getUserId() != 0 && isPrdEnv && relation.getYhsId() == 0) {
                 //发送短信
-                smsService.sendSmsToRelationUser(relation.getUserId(), msg);
+                smsService.sendSmsToRelationUser(relation.getUserId(), Constant.CHANGE_GROUPS_TRIPS_ACCOUNT, title);
             }
             if (verifyCodeList != null && verifyCodeList.size() > 0 && i < verifyCodeList.size()) {
                 relation.setVerifyCode(verifyCodeList.get(i));
@@ -438,9 +437,8 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
                 return;
             }
             if (relation.getUserId() != 0 && isPrd && relation.getYhsId() == 0) {
-                String msg = String.format(Constant.CHANGE_GROUPS_TRIPS_ACCOUNT, title);
                 try {
-                    smsService.sendSmsToRelationUser(relation.getUserId(), msg);
+                    smsService.sendSmsToRelationUser(relation.getUserId(), Constant.CHANGE_GROUPS_TRIPS_ACCOUNT, title);
                 } catch (Exception e) {
                 }
             }

netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -12,6 +12,7 @@ import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.*;
 import com.cyksj.mapper.manage.statistics.*;
 import com.cyksj.mapper.shop.YhShopMapper;
+import com.cyksj.model.dto.MonthlyUserOrderDetailDto;
 import com.cyksj.model.dto.NatureOrderDataDto;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.excel.ExcelAccountData;
@@ -426,12 +427,28 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 			case 4:
 				getRenewOrderData(groupsDataStatisticsView, startDate, endDate);
 				break;
+			case 5:
+				getUnbindChannelOrderData(groupsDataStatisticsView, startDate, endDate);
+				break;
 			default:
 				getSynthesisData(groupsDataStatisticsView, startDate, endDate);
 		}
 		return groupsDataStatisticsView;
 	}
 
+	private void getUnbindChannelOrderData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
+		//解绑渠道
+		//流媒体
+		BigDecimal unBIndGroupsStreamingMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(4, null, 2l, startDate, endDate)).orElse(BigDecimal.ZERO);
+		// AI销售金额
+		BigDecimal unBIndGroupsAiOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(4, null, 1l, startDate, endDate)).orElse(BigDecimal.ZERO);
+		//设备销售金额
+		BigDecimal unBIndGroupsEpOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(4, 2, null, startDate, endDate)).orElse(BigDecimal.ZERO);
+		groupsDataStatisticsView.setUnBIndGroupsStreamingMoney(unBIndGroupsStreamingMoney);
+		groupsDataStatisticsView.setUnBIndGroupsAiOrderMoney(unBIndGroupsAiOrderMoney);
+		groupsDataStatisticsView.setUnBIndGroupsEpOrderMoney(unBIndGroupsEpOrderMoney);
+	}
+
 	public void getNatureOrderData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
 		List<NatureOrderDataDto> orderDataList = statisticsExportMapper.getGroupsOrderData(startDate, endDate);
 		orderDataList.forEach(data -> {
@@ -447,6 +464,9 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 			if (data.getType() == 3) {
 				groupsDataStatisticsView.setChannelMoney(money);
 			}
+			if (data.getType() == 4) {
+				groupsDataStatisticsView.setUnBindChannelMoney(money);
+			}
 		});
 		if (groupsDataStatisticsView.getNatureMoney() == null) {
 			groupsDataStatisticsView.setNatureMoney(BigDecimal.ZERO);
@@ -505,6 +525,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 			try {
 				getGroupsOrderCategoryData(groupsDataStatisticsView, startDate, endDate);
 				getRenewOrderData(groupsDataStatisticsView, startDate, endDate);
+				getUnbindChannelOrderData(groupsDataStatisticsView, startDate, endDate);
 			} finally {
 				latch.countDown();
 			}
@@ -578,6 +599,25 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		//Ai A中第二单 为流媒体
 		Integer monthAiNewPayStreamingNumOfUser = statisticsExportMapper.getMonthAiNewPayStreamingNumOfUser(thisMonth, nextMonth);
 
+		//用户维度 订单数据
+		List<MonthlyUserOrderDetailDto> monthlyUserOrderDetails = statisticsExportMapper.getMonthlyUserOrderDetail(thisMonth, nextMonth);
+		Integer monthlyNewUserOrders = 0;
+		BigDecimal monthlyNewUserOrdersMoney = BigDecimal.ZERO;
+		Integer monthlyBeforeUserOrders = 0;
+		BigDecimal monthlyBeforeUserOrdersMoney = BigDecimal.ZERO;
+		for (MonthlyUserOrderDetailDto monthlyUserOrderDetail : monthlyUserOrderDetails) {
+			BigDecimal money = monthlyUserOrderDetail.getMoney();
+			Integer orders = monthlyUserOrderDetail.getOrders();
+			//上月
+			if (monthlyUserOrderDetail.getType() == 1) {
+				monthlyBeforeUserOrders = orders;
+				monthlyBeforeUserOrdersMoney = money;
+			} else {
+				monthlyNewUserOrders = orders;
+				monthlyNewUserOrdersMoney = money;
+			}
+		}
+
 //		//历史复购 AI、奈飞车票人数 以及交叉
 //		Integer nfTicketNumOfUser = statisticsExportMapper.getNfTicketNumOfUser(1l);
 //
@@ -609,7 +649,12 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 				.setMonthStreamingNewPayAiNumOfUser(monthStreamingNewPayAiNumOfUser)
 				.setMonthAiNewNumOfUser(monthAiNewNumOfUser)
 				.setMonthAiNewPayOtherNumOfUser(monthAiNewPayOtherNumOfUser)
-				.setMonthAiNewPayStreamingNumOfUser(monthAiNewPayStreamingNumOfUser);
+				.setMonthAiNewPayStreamingNumOfUser(monthAiNewPayStreamingNumOfUser)
+				.setMonthlyNewUserOrders(monthlyNewUserOrders)
+				.setMonthlyNewUserOrdersMoney(monthlyNewUserOrdersMoney)
+				.setMonthlyBeforeUserOrders(monthlyBeforeUserOrders)
+				.setMonthlyBeforeUserOrdersMoney(monthlyBeforeUserOrdersMoney)
+				;
 //				.setNfTicketNumOfUser(nfTicketNumOfUser)
 //				.setAiTicketNumOfUser(aiTicketNumOfUser)
 //				.setNfAiTicketNumOfUser(nfAiTicketNumOfUser)

netflix-service/src/main/java/com/cyksj/service/order/OrderDonPostService.java

@@ -5,7 +5,7 @@ package com.cyksj.service.order;
  * @date 2023/5/16 11:05 AM
  */
 public interface OrderDonPostService {
-    void postData(Long orderId) throws Exception;
+    void postData(Long orderId, Long goodsId, Long popularizeId) throws Exception;
 
     void savePostData(Long orderId, String callback, String callbackType);
 

netflix-service/src/main/java/com/cyksj/service/order/OrderRefundService.java

@@ -20,5 +20,5 @@ public interface OrderRefundService {
 	/**
 	 * 退款记录
 	 */
-	void refundRecord(OrderDon orderDon, BigDecimal refundMoney, GoodsDon goodsDon, GoodsDonSku sku, String outRefundNo, String refundType);
+	void refundRecord(OrderDon orderDon, BigDecimal refundMoney, String operator, GoodsDon goodsDon, GoodsDonSku sku, String outRefundNo, String refundType);
 }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonPostServiceImpl.java

@@ -1,16 +1,16 @@
 package com.cyksj.service.order.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cyksj.common.constant.Constant;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.mapper.OrderDonMapper;
-import com.cyksj.mapper.sys.SysConfigMapper;
+import com.cyksj.mapper.channel.ChannelPopularizeMapper;
 import com.cyksj.mapper.order.OrderDonPostMapper;
-import com.cyksj.model.entity.OrderDon;
+import com.cyksj.mapper.sys.SysConfigMapper;
+import com.cyksj.model.entity.ChannelPopularize;
 import com.cyksj.model.entity.OrderDonPost;
-import com.cyksj.model.entity.SysConfig;
 import com.cyksj.service.order.OrderDonPostService;
 import com.cyksj.service.order.post.AbstractPostDataService;
 import com.cyksj.service.order.post.PostDataFactory;
@@ -35,23 +35,23 @@ public class OrderDonPostServiceImpl extends ServiceImpl<OrderDonPostMapper, Ord
 
     private final SysConfigMapper sysConfigMapper;
 
+    private final ChannelPopularizeMapper channelPopularizeMapper;
+
     @Override
-    public void postData(Long orderId) throws Exception {
+    public void postData(Long orderId, Long goodsId, Long popularizeId) throws Exception {
         OrderDonPost orderPost = this.getOne(Wrappers.lambdaQuery(OrderDonPost.class).eq(OrderDonPost::getOrderId, orderId).eq(OrderDonPost::getStatus, Boolean.FALSE));
         if (orderPost == null) {
             log.info("post 数据 不了存在 id:{}", orderId);
             return;
         }
-        if (orderPost.getType() == OrderDonPost.Type.BaiDu) {
-            SysConfig baiduFilterConfig = sysConfigMapper.selectOne(Wrappers.lambdaQuery(SysConfig.class)
-                    .eq(SysConfig::getSysKey, Constant.BAIDU_POST_FILTER_GOODS_KEY).last("limit 1"));
-            if (baiduFilterConfig != null) {
-                String sysValue = baiduFilterConfig.getSysValue();
-                if (StrUtil.isNotBlank(sysValue)) {
-                    List<Long> baiduFilterGoods = Jsons.parseList(sysValue, Long.class);
-                    OrderDon orderDon = orderDonMapper.selectById(orderId);
-                    if (baiduFilterGoods.contains(orderDon.getGoodsId())) {
-                        log.info("baidu 不回传该商品. 该订单商品id:{}", orderDon.getGoodsId());
+        if (popularizeId != null) {
+            ChannelPopularize channelPopularize = channelPopularizeMapper.selectById(popularizeId);
+            if (channelPopularize != null) {
+                String filterGoodsIds = channelPopularize.getFilterGoodsIds();
+                if (StrUtil.isNotBlank(filterGoodsIds)) {
+                    List<Long> filterGoodsIdList = Jsons.parseList(filterGoodsIds, Long.class);
+                    if (CollUtil.isNotEmpty(filterGoodsIdList) && filterGoodsIdList.contains(goodsId)) {
+                        log.info("该条:{}投放链接 不回传该商品. 该订单商品id:{}", popularizeId, goodsId);
                         return;
                     }
                 }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderRefundServiceImpl.java

@@ -84,7 +84,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
 	}
 
 	@Override
-	public void refundRecord(OrderDon orderDon, BigDecimal refundMoney, GoodsDon goodsDon, GoodsDonSku sku, String outRefundNo, String refundType) {
+	public void refundRecord(OrderDon orderDon, BigDecimal refundMoney, String operator, GoodsDon goodsDon, GoodsDonSku sku, String outRefundNo, String refundType) {
 		RefundOrderDon refund = new RefundOrderDon();
 		refund.setOrderId(orderDon.getId());
 		refund.setOutRefundNo(outRefundNo);
@@ -99,6 +99,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
 		refund.setSpecVal(sku == null ? null : String.format("%s%s", sku.getSpecVal(), sku.getPrice().divide(BigDecimal.valueOf(100))));
 		refund.setRefundMethod(orderDon.getType().name());
 		refund.setGoodsType(goodsDon == null ? 0 : goodsDon.getType());
+		refund.setOperator(operator);
 		//退款方式
 		if (StrUtil.isNotBlank(refundType) && refundType.equals(OrderDon.Type.BALANCE.getType())) {
 			refund.setRefundMethod(refundType);

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -108,17 +108,20 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		}
 		List<Long> userIds = userBindRelationService.getRelationUserIdList(userId, u);
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
-		Long yhsId = yhShopFrontService.getYhsIdByCustomId(customId);
+		//Long yhsId = yhShopFrontService.getYhsIdByCustomId(customId);
 		List<RenewalView> list = beanSearcher.searchAll(RenewalView.class, builder
 				.field(RenewalView::getUserId, 0).op(Operator.GreaterThan)
 				.field(RenewalView::getUserId, userIds).op(Operator.InList)
-				.field(RenewalView::getYhsId, yhsId)
+				//.field(RenewalView::getYhsId, yhsId)
 				.field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
 				.orderBy(RenewalView::getExpiryTime).asc()
 				.build());
 		//过滤邀请制、已失效的车位
 		DateTime now = DateTime.now();
 		list.stream().forEach(ticket -> {
+			if (ticket.getSkuId() == null || ticket.getGoodsId() == null) {
+				return;
+			}
 			if (ticket.getGoodsId() == 18 && ticket.getSkuNum() > 1) {
 				ticket.setPassword(null);
 			}
@@ -576,8 +579,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 	public Integer getUserCodeNumBySkuId(Long userId, Long skuId) {
 		//查看双重验证码
 		UserFuncProperty userFuncProperty = userFuncPropertyMapper.selectOne(Wrappers.lambdaQuery(UserFuncProperty.class).eq(UserFuncProperty::getUserId, userId).last("limit 1"));
-		//默认1次
-		int num = 1;
+		//默认0次
+		int num = 0;
 		//查看双重验证码次数
 		GoodsDonSku sku = goodsDonSkuMapper.selectById(skuId);
 		if (sku.getCodeNum() > 0) {

netflix-service/src/main/java/com/cyksj/service/scheduler/impl/SchedulerServiceImpl.java

@@ -220,7 +220,7 @@ public class SchedulerServiceImpl implements SchedulerService {
 							if (sku == null) return;
 							skuMap.putIfAbsent(orderDon.getSkuId(), sku);
 						}
-						orderRefundService.refundRecord(orderDon, orderDon.getRefundMoney(), goodsDon, sku, StrUtil.EMPTY, "balance");
+						orderRefundService.refundRecord(orderDon, orderDon.getRefundMoney(), null, goodsDon, sku, StrUtil.EMPTY, "balance");
 						return;
 					}
 					changeTickerRelation(item_groupsId, relationView, source, relationView.getYhsId());

netflix-service/src/main/java/com/cyksj/service/sms/SmsService.java

@@ -11,5 +11,5 @@ public interface SmsService {
 	/**
 	 * 发送车队短信通知 车位用户
 	 */
-	void sendSmsToRelationUser(Long userId, String msg) throws Exception;
+	void sendSmsToRelationUser(Long userId, String template, String... title) throws Exception;
 }

netflix-service/src/main/java/com/cyksj/service/sms/impl/SmsServiceImpl.java

@@ -1,8 +1,10 @@
 package com.cyksj.service.sms.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.cyksj.common.constant.Constant;
 import com.cyksj.common.util.SmsUtil;
 import com.cyksj.mapper.GroupsRelationMapper;
+import com.cyksj.model.entity.PhoneCode;
 import com.cyksj.service.sms.SmsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -21,10 +23,20 @@ public class SmsServiceImpl implements SmsService {
 	private final GroupsRelationMapper groupsRelationMapper;
 
 	@Override
-	public void sendSmsToRelationUser(Long userId, String msg) throws Exception {
-		String phone = groupsRelationMapper.getBindPhoneByUserId(userId);
-		if (StrUtil.isNotBlank(phone)) {
-			SmsUtil.sendLuoKey2Msg(phone, msg);
+	public void sendSmsToRelationUser(Long userId, String template, String... objs) throws Exception {
+		PhoneCode areaPhone = groupsRelationMapper.getAreaPhoneByUserId(userId);
+		if (areaPhone != null && StrUtil.isNotBlank(areaPhone.getPhone())) {
+			String phone = areaPhone.getPhone();
+			//国际短信通知
+			if (areaPhone.getCid() != null && areaPhone.getCid() != 86) {
+				if (StrUtil.equals(template, Constant.CHANGE_GROUPS_TRIPS_ACCOUNT)) {
+					log.info("发送手机号:{}国际化短信通知车票账号密码修改", phone);
+					SmsUtil.sendAccountInternalSmsMsg(areaPhone.getCid(), phone, objs[0]);
+				}
+			} else {
+				String msg = String.format(template, objs);
+				SmsUtil.sendLuoKey2Msg(phone, msg);
+			}
 		}
 	}
 }