add 实物分销功能

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

@@ -45,4 +45,9 @@ public interface Constant {
 	 * 特定订单有效时间
 	 */
 	String LOTTERY_SPECIFIC_ORDER_EFFECTIVE_TIME = "lottery_specific_order_effective_time";
+
+	/**
+	 * 实物分销配置
+	 */
+	String EQUIPMENT_DISTRIBUTE_KEY = "equipment_distribute_key";
 }

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

@@ -0,0 +1,19 @@
+package com.cyksj.mapper.manage.distribute.equipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.EquipmentUserChance;
+import org.apache.ibatis.annotations.Update;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentUserChanceMapper
+ *创建者: JavaZou
+ *创建时间:2023/2/23 13:34
+ */
+public interface EquipmentUserChanceMapper extends BaseMapper<EquipmentUserChance> {
+	@Update("update equipment_user_chance set num = num + 1 where user_id = #{userId} where num >= 0")
+	void addUserChance(Long userId);
+
+	@Update("update equipment_user_chance set num = num - 1 where user_id = #{userId} where num >= 1")
+	Integer subUserChance(Long userId);
+}

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

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.manage.distribute.equipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.EquipmentUserChanceRecord;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentUserChanceRecordMapper
+ *创建者: JavaZou
+ *创建时间:2023/2/23 13:35
+ */
+public interface EquipmentUserChanceRecordMapper extends BaseMapper<EquipmentUserChanceRecord> {
+}

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

@@ -0,0 +1,13 @@
+package com.cyksj.mapper.manage.distribute.equipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.EquipmentUserDistributeInviteRecord;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentUserDistributeInviteRecordMapper
+ *创建者: JavaZou
+ *创建时间:2023/2/23 13:32
+ */
+public interface EquipmentUserDistributeInviteRecordMapper extends BaseMapper<EquipmentUserDistributeInviteRecord> {
+}

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

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

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

@@ -26,4 +26,9 @@ public class AuthRedirect {
      */
     private String corpId;
 
+    /**
+     * 分销类型
+     * 1、虚物 2、实物
+     */
+    private Integer dsType;
 }

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

@@ -0,0 +1,28 @@
+package com.cyksj.model.dto;
+
+import com.cyksj.model.entity.GoodsDonSku;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Set;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentConfigDto
+ *创建者: JavaZou
+ *创建时间:2023/2/23 15:56
+ */
+@Getter
+@Setter
+public class EquipmentConfigDto {
+	/**
+	 * 新人可活得优惠券id配置
+	 */
+	private Set<Long> couponIds;
+
+	/**
+	 * 车票时长权益配置
+	 */
+	private List<GoodsDonSku> skuList;
+}

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

@@ -59,6 +59,7 @@ public class CouponUser extends BaseEntity {
 		manual("manual","手动发放"),
 		lottery("lottery","抽奖"),
 		task("task","完成任务"),
+		equipment("equipment","实物设备分销"),
 		;
 		private String channel;
 		private String desc;

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

@@ -0,0 +1,18 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentUserChance
+ *创建者: JavaZou
+ *创建时间:2023/2/23 13:32
+ */
+@Getter
+@Setter
+public class EquipmentUserChance extends BaseEntity{
+	private Long userId;
+
+	private Integer num;
+}

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

@@ -0,0 +1,41 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentUserChanceRecord
+ *创建者: JavaZou
+ *创建时间:2023/2/23 13:34
+ */
+@Getter
+@Setter
+public class EquipmentUserChanceRecord extends BaseEntity{
+	/**
+	 * 受益人id
+	 */
+	private Long shareId;
+
+	/**
+	 * 被邀请人id
+	 */
+	private Long userId;
+
+	private Long orderId;
+
+	private Status status;
+
+
+	@Getter
+	public enum Status {
+		hasPayment("已购买"),
+		refund("已退款"),
+		;
+		String msg;
+
+		Status(String msg) {
+			this.msg = msg;
+		}
+	}
+}

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

@@ -0,0 +1,24 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentUserDistributeInviteRecord
+ *创建者: JavaZou
+ *创建时间:2023/2/23 11:24
+ */
+@Getter
+@Setter
+public class EquipmentUserDistributeInviteRecord extends BaseEntity{
+	/**
+	 * 邀请人id
+	 */
+	private Long shareId;
+
+	/**
+	 * 被邀请人id
+	 */
+	private Long userId;
+}

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

@@ -0,0 +1,41 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentUserReceiveBenefitsRecord
+ *创建者: JavaZou
+ *创建时间:2023/2/23 13:37
+ */
+@Getter
+@Setter
+public class EquipmentUserReceiveBenefitsRecord extends BaseEntity{
+	private Long userId;
+
+	/**
+	 * 时长
+	 */
+	private Integer days;
+
+	/**
+	 * 规格
+	 */
+	private Long skuId;
+
+	/**
+	 * 月数
+	 */
+	private Integer num;
+
+	/**
+	 * 权益对应车票座位
+	 */
+	private Long relationId;
+
+	/**
+	 * 默认1成功,退款后0
+	 */
+	private Integer statusCode;
+}

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

@@ -162,6 +162,7 @@ public class OrderDon extends BaseEntity implements Serializable {
         ALI_PAY("zfb","支付宝"),
         EX_CODE("exchange_code","兑换码"),
         LOTTERY("lottery","抽奖"),
+        EQUIPMENT("equipment", "实物设备分销"),
         ;
         String type;
         String desc;

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

@@ -2,6 +2,7 @@ package com.cyksj.model.manage.views;
 
 import com.cyksj.model.entity.GroupsRelation;
 import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
@@ -96,4 +97,7 @@ public class GroupsRelationView {
     @DbField("gr.account")
     private String account;
 
+    @DbIgnore
+    private Date updateExpiryTime;
+
 }

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

@@ -34,6 +34,11 @@ public class LoginPhoneReq {
 	 */
 	private Integer type;
 
+	/**
+	 * 1、虚物，2、实物
+	 */
+	private Integer dsType;
+
 	/**
 	 * 推广id
 	 */

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

@@ -0,0 +1,20 @@
+package com.cyksj.model.views;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentDistributeView
+ *创建者: JavaZou
+ *创建时间:2023/2/23 15:43
+ */
+@Getter
+@Setter
+public class EquipmentDistributeView {
+	private Integer num;
+
+	private String url;
+
+	private String equipmentConfig;
+}

netflix-service/src/main/java/com/cyksj/redis/RedisService.java

@@ -595,6 +595,7 @@ public class RedisService {
         TASK_TIME_LIMIT_KEY("task_time_limit:%s", "一次性任务key", 30),
         WX_GZH_QRCODE_LOGIN("wx_gzh_qrcode_login:%s", "微信公众号扫码登录key", 60),
         WX_GZH_QRCODE_SHARED_LOGIN("wx_gzh_qrcode_shared_login:%s", "微信公众号扫码分享邀请key", 60),
+        EQUIPMENT_DISTRIBUTE_COUPON_KEY("equipment_distribute_coupon_key:%s", "实物设备分销新用户优惠券展示key", 60),
         ;
 
         private String name;

netflix-service/src/main/java/com/cyksj/service/distribute/equipment/EquipmentDistributeFrontService.java

@@ -0,0 +1,13 @@
+package com.cyksj.service.distribute.equipment;
+
+import com.cyksj.model.manage.views.GroupsRelationView;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentDistributeFrontService
+ *创建者: JavaZou
+ *创建时间:2023/2/23 16:19
+ */
+public interface EquipmentDistributeFrontService {
+	GroupsRelationView useBenefits(Long userId, Long skuId);
+}

netflix-service/src/main/java/com/cyksj/service/distribute/equipment/EquipmentDistributeService.java

@@ -0,0 +1,28 @@
+package com.cyksj.service.distribute.equipment;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentDistributeService
+ *创建者: JavaZou
+ *创建时间:2023/2/23 13:41
+ */
+public interface EquipmentDistributeService {
+
+	/**
+	 * 保存分销邀请记录
+	 * sharedId: 邀请人
+	 * isNewUser: 新用户
+	 * userId: 被邀请人
+	 */
+	void saveDistributionInvitation(Long sharedId, Boolean isNewUser, Long userId);
+
+	/**
+	 * 领取权益次数增加
+	 */
+	void addDistributeBenefitsChance(Long userId, Long orderId);
+
+	/**
+	 * 减少权益次数
+	 */
+	void subDistributeBenefitsChance(Long userId, Long orderId);
+}

netflix-service/src/main/java/com/cyksj/service/distribute/equipment/impl/EquipmentDistributeFrontServiceImpl.java

@@ -0,0 +1,67 @@
+package com.cyksj.service.distribute.equipment.impl;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.mapper.GoodsDonSkuMapper;
+import com.cyksj.mapper.GroupsRelationMapper;
+import com.cyksj.model.entity.GoodsDonSku;
+import com.cyksj.model.entity.GroupsRelation;
+import com.cyksj.model.entity.OrderDon;
+import com.cyksj.model.manage.views.GroupsRelationView;
+import com.cyksj.service.distribute.equipment.EquipmentDistributeFrontService;
+import com.cyksj.service.exchange.ExchangeCodeService;
+import com.ejlchina.searcher.BeanSearcher;
+import com.ejlchina.searcher.util.MapUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentDistributeFrontServiceImpl
+ *创建者: JavaZou
+ *创建时间:2023/2/23 16:20
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class EquipmentDistributeFrontServiceImpl implements EquipmentDistributeFrontService {
+	private final GroupsRelationMapper groupsRelationMapper;
+
+	private final BeanSearcher beanSearcher;
+
+	private final ExchangeCodeService exchangeCodeService;
+
+	private final GoodsDonSkuMapper goodsDonSkuMapper;
+
+	@Override
+	public GroupsRelationView useBenefits(Long userId, Long skuId) {
+		GroupsRelationView groupsRelationView = beanSearcher.searchFirst(GroupsRelationView.class, MapUtils.builder()
+				.field(GroupsRelationView::getSkuId, skuId)
+				.orderBy(GroupsRelationView::getExpiryTime).asc()
+				.field(GroupsRelationView::getUserId, userId)
+				.build());
+		GoodsDonSku goodsDonSku = goodsDonSkuMapper.selectById(skuId);
+		if (groupsRelationView == null) {
+			//领取权益时，没有车票的用户自动上车，获得对应车票
+			exchangeCodeService.getGroupTripsTicket(goodsDonSku, userId, null, OrderDon.Type.EQUIPMENT);
+		}else {
+			Date expiryTime = groupsRelationView.getExpiryTime();
+			if (expiryTime == null) {
+				throw BusinessRuntimeException.getInstance("该车位暂未发车,请发车后再领取权益");
+			}
+			DateTime updateExpiryTime = DateUtil.offset(expiryTime, DateField.MONTH, goodsDonSku.getMonths());
+			groupsRelationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+					.eq(GroupsRelation::getId, groupsRelationView.getId())
+					.eq(GroupsRelation::getUserId, userId)
+					.set(GroupsRelation::getExpiryTime, updateExpiryTime));
+			groupsRelationView.setUpdateExpiryTime(updateExpiryTime);
+		}
+		return groupsRelationView;
+	}
+}

netflix-service/src/main/java/com/cyksj/service/distribute/equipment/impl/EquipmentDistributeServiceImpl.java

@@ -0,0 +1,184 @@
+package com.cyksj.service.distribute.equipment.impl;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.constant.Constant;
+import com.cyksj.common.util.Jsons;
+import com.cyksj.mapper.GroupsRelationMapper;
+import com.cyksj.mapper.manage.distribute.equipment.EquipmentUserChanceMapper;
+import com.cyksj.mapper.manage.distribute.equipment.EquipmentUserChanceRecordMapper;
+import com.cyksj.mapper.manage.distribute.equipment.EquipmentUserDistributeInviteRecordMapper;
+import com.cyksj.mapper.manage.distribute.equipment.EquipmentUserReceiveBenefitsRecordMapper;
+import com.cyksj.model.dto.EquipmentConfigDto;
+import com.cyksj.model.entity.*;
+import com.cyksj.redis.RedisService;
+import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
+import com.cyksj.service.mange.coupon.CouponCommonService;
+import com.cyksj.service.relation.GroupRelationClearService;
+import com.cyksj.service.sys.SysConfigService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentDistributeServiceImpl
+ *创建者: JavaZou
+ *创建时间:2023/2/23 13:42
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class EquipmentDistributeServiceImpl implements EquipmentDistributeService {
+
+	private final EquipmentUserDistributeInviteRecordMapper inviteRecordMapper;
+
+	private final EquipmentUserChanceMapper equipmentUserChanceMapper;
+
+	private final EquipmentUserChanceRecordMapper equipmentUserChanceRecordMapper;
+
+	private final EquipmentUserReceiveBenefitsRecordMapper equipmentUserReceiveBenefitsRecordMapper;
+
+	private final GroupsRelationMapper groupsRelationMapper;
+
+	private final GroupRelationClearService groupRelationClearService;
+
+	private final SysConfigService sysConfigService;
+
+	private final CouponCommonService couponCommonService;
+
+	private final RedisService redisService;
+
+	@Override
+	public void saveDistributionInvitation(Long sharedId, Boolean isNewUser, Long userId) {
+		EquipmentUserDistributeInviteRecord exists = inviteRecordMapper.selectOne(Wrappers.lambdaQuery(EquipmentUserDistributeInviteRecord.class)
+				.eq(EquipmentUserDistributeInviteRecord::getUserId, userId).last("limit 1"));
+		if (exists == null) {
+			EquipmentUserDistributeInviteRecord record = new EquipmentUserDistributeInviteRecord();
+			record.setShareId(sharedId);
+			//存在分销
+			record.setUserId(userId);
+			try {
+				inviteRecordMapper.insert(record);
+				//发放新用户福利优惠券
+				if (isNewUser) {
+					sendInvitedUserEquipmentCoupon(userId);
+				}
+			} catch (DuplicateKeyException e) {
+				log.info("实物分销被邀请人id:{}重复插入", userId);
+			}
+		}
+	}
+
+	@Override
+	public void addDistributeBenefitsChance(Long userId, Long orderId) {
+		EquipmentUserDistributeInviteRecord record = getDistributeRecord(userId);
+		if (record != null) {
+			Long sharId = record.getShareId();
+			if (saveInviteRecord(sharId, userId, orderId, EquipmentUserChanceRecord.Status.hasPayment)) {
+				EquipmentUserChance chance = equipmentUserChanceMapper.selectOne(Wrappers.lambdaQuery(EquipmentUserChance.class)
+						.eq(EquipmentUserChance::getUserId, sharId)
+						.last("limit 1"));
+				if (chance == null) {
+					try {
+						chance = new EquipmentUserChance();
+						chance.setUserId(sharId);
+						chance.setNum(1);
+						equipmentUserChanceMapper.insert(chance);
+					} catch (DuplicateKeyException e) {
+						equipmentUserChanceMapper.addUserChance(sharId);
+					}
+				} else {
+					equipmentUserChanceMapper.addUserChance(sharId);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void subDistributeBenefitsChance(Long userId, Long orderId) {
+		EquipmentUserDistributeInviteRecord record = getDistributeRecord(userId);
+		if (record != null) {
+			Long sharId = record.getShareId();
+			if (saveInviteRecord(sharId, userId, orderId, EquipmentUserChanceRecord.Status.refund)) {
+				Integer update = equipmentUserChanceMapper.subUserChance(sharId);
+				if (update == 1) {
+					//扣除权益
+					deductUserBenefits(sharId);
+				}
+			}
+		}
+	}
+
+	public EquipmentUserDistributeInviteRecord getDistributeRecord(Long userId) {
+		//是否有实物分销邀请记录
+		EquipmentUserDistributeInviteRecord record = inviteRecordMapper.selectOne(Wrappers.lambdaQuery(EquipmentUserDistributeInviteRecord.class)
+				.eq(EquipmentUserDistributeInviteRecord::getUserId, userId)
+				.last("limit 1"));
+		if (record == null) {
+			return null;
+		}
+		return record;
+	}
+
+	public Boolean saveInviteRecord(Long sharId, Long userId, Long orderId, EquipmentUserChanceRecord.Status status) {
+		EquipmentUserChanceRecord record = equipmentUserChanceRecordMapper.selectOne(Wrappers.lambdaQuery(EquipmentUserChanceRecord.class)
+				.eq(EquipmentUserChanceRecord::getUserId, userId)
+				.eq(EquipmentUserChanceRecord::getStatus, status)
+				.eq(EquipmentUserChanceRecord::getOrderId, orderId));
+		if (record != null) {
+			return false;
+		}
+		record = new EquipmentUserChanceRecord();
+		record.setShareId(sharId);
+		record.setUserId(userId);
+		record.setStatus(status);
+		record.setOrderId(orderId);
+		equipmentUserChanceRecordMapper.insert(record);
+		return true;
+	}
+
+	public void deductUserBenefits(Long userId) {
+		EquipmentUserReceiveBenefitsRecord receiveBenefitsRecord = equipmentUserReceiveBenefitsRecordMapper.selectOne(Wrappers.lambdaQuery(EquipmentUserReceiveBenefitsRecord.class)
+				.eq(EquipmentUserReceiveBenefitsRecord::getStatusCode, 1)
+				.eq(EquipmentUserReceiveBenefitsRecord::getUserId, userId)
+				.orderByDesc(EquipmentUserReceiveBenefitsRecord::getId).last("limit 1"));
+		if (receiveBenefitsRecord == null) {
+			return;
+		}
+		Integer months = receiveBenefitsRecord.getNum();
+		Long relationId = receiveBenefitsRecord.getRelationId();
+		GroupsRelation relation = groupsRelationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
+				.eq(GroupsRelation::getUserId, userId)
+				.eq(GroupsRelation::getId, relationId).eq(GroupsRelation::getStatus, GroupsRelation.Status.validity).last("limit 1"));
+		Date expiryTime = relation.getExpiryTime();
+		if (relation == null || expiryTime == null) {
+			return;
+		}
+		DateTime now = DateTime.now();
+		Date finalDate = DateUtil.offset(expiryTime, DateField.MONTH, -months);
+		if (now.isAfter(finalDate)) {
+			//过期 直接清除车票
+			groupRelationClearService.clearTicket(relation);
+		} else {
+			relation.setExpiryTime(finalDate);
+			groupsRelationMapper.updateById(relation);
+		}
+		relation.setStartTime(relation.getStartTime() == null ? new Date() : null);
+	}
+
+	public void sendInvitedUserEquipmentCoupon(Long userId) {
+		SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
+				.eq(SysConfig::getSysKey, Constant.EQUIPMENT_DISTRIBUTE_KEY).last("limit 1"));
+		EquipmentConfigDto equipmentConfigDto = Jsons.parseObject(config, EquipmentConfigDto.class);
+		equipmentConfigDto.getCouponIds().forEach(couponId->{
+			couponCommonService.sendCouponToUser(userId, couponId, null, null, null, CouponUser.Channel.equipment);
+		});
+		redisService.set(RedisService.key.EQUIPMENT_DISTRIBUTE_COUPON_KEY.getNameFormat(userId), userId, RedisService.key.EQUIPMENT_DISTRIBUTE_COUPON_KEY.getTimeout());
+	}
+}

netflix-service/src/main/java/com/cyksj/service/exchange/ExchangeCodeService.java

@@ -3,6 +3,8 @@ package com.cyksj.service.exchange;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cyksj.dto.Result;
 import com.cyksj.model.entity.ExchangeCode;
+import com.cyksj.model.entity.GoodsDonSku;
+import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.excel.ExcelExchangeCodeData;
 import com.cyksj.model.request.ExchangeCodeReq;
 import com.cyksj.model.request.ExchangeCodeTicket;
@@ -30,4 +32,9 @@ public interface ExchangeCodeService extends IService<ExchangeCode> {
 	 * 获取兑换码
 	 */
 	String getExCode(Long goodsId, Long skuId, Integer type);
+
+	/**
+	 * 获取车票
+	 */
+	void getGroupTripsTicket(GoodsDonSku sku, Long userId, OrderDon exCodeOrderDon, OrderDon.Type orderDonTye);
 }

netflix-service/src/main/java/com/cyksj/service/exchange/impl/ExchangeCodeServiceImpl.java

@@ -149,7 +149,7 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 			throw BusinessRuntimeException.getInstance("您的订单已退款,无法使用该兑换码");
 		}
 		//生成车票订单
-		getGroupTripsTicket(goodsDonSkuMapper.selectById(exchangeCode.getSkuId()), userId, orderDon);
+		getGroupTripsTicket(goodsDonSkuMapper.selectById(exchangeCode.getSkuId()), userId, orderDon, OrderDon.Type.EX_CODE);
 		log.info("用户:{}通过兑换码:{}兑换成功", userId, exchangeCodeTicket.getCode());
 		if (exchangeCode.getType() == 1) {
 			luckyDrawRecordMapper.updateExCodeStatus(userId, exchangeCode.getCode());
@@ -206,7 +206,8 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 	/**
 	 * 获取车位
 	 */
-	private void getGroupTripsTicket(GoodsDonSku sku, Long userId, OrderDon exCodeOrderDon) {
+	@Override
+	public void getGroupTripsTicket(GoodsDonSku sku, Long userId, OrderDon exCodeOrderDon, OrderDon.Type orderDonTye) {
 		if (sku == null) {
 			throw BusinessRuntimeException.getInstance("规格不存在,请联系客服");
 		}
@@ -243,7 +244,7 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 			setRelation(relation.getId(), userId);
 		} catch (Exception e) {
 			//失败重新给他分配车位
-			getGroupTripsTicket(sku, userId, exCodeOrderDon);
+			getGroupTripsTicket(sku, userId, exCodeOrderDon, orderDonTye);
 		}
 		relation.setUserId(userId);
 		relation.setStatus(GroupsRelation.Status.validity);
@@ -285,7 +286,7 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 				try {
 					if (StrUtil.isNotEmpty(user.getOpenId())) {
 						log.info("用户{}兑换车位成功，发送新订单模板消息", user.getId());
-						templateCommonService.newOderSendMsgByType(orderDon, goodsDon, sku, user,user.getOpenId());
+						templateCommonService.newOderSendMsgByType(orderDon, goodsDon, sku, user, user.getOpenId());
 					}
 				} catch (Exception e) {
 					log.info("用户{}兑换车位成功，发送消息失败:{}", user.getId(), e);

netflix-service/src/main/java/com/cyksj/service/gzh/factory/EventMsgService.java

@@ -5,11 +5,13 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.util.Codec;
+import com.cyksj.common.util.Jsons;
 import com.cyksj.config.WeChatConfig;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.WxAppMapper;
 import com.cyksj.mapper.WxSyncLogMapper;
 import com.cyksj.mapper.gzh.UserGzhRelationMapper;
+import com.cyksj.model.dto.AuthRedirect;
 import com.cyksj.model.dto.GzhUnionidUserinfo;
 import com.cyksj.model.dto.MsgEvent;
 import com.cyksj.model.entity.User;
@@ -18,6 +20,7 @@ import com.cyksj.model.entity.WxApp;
 import com.cyksj.model.entity.WxSyncLog;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.distribute.DistributeService;
+import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
 import com.cyksj.service.user.UserService;
 import com.cyksj.service.wechat.WeChatService;
 import lombok.RequiredArgsConstructor;
@@ -49,6 +52,8 @@ public class EventMsgService implements GzhMsgService {
 
 	private final DistributeService distributeService;
 
+	private final EquipmentDistributeService equipDistributeService;
+
 	private final UserService userService;
 
 	private final WeChatConfig weChatConfig;
@@ -103,7 +108,13 @@ public class EventMsgService implements GzhMsgService {
 
 		User user = userService.getSyncUser(info.getOpenid(), info.getUnionid(), wxSyncLog);
 
+		String state = redisService.getStr(RedisService.key.WX_GZH_QRCODE_SHARED_LOGIN.getNameFormat(sceneKey));
+		// 转跳参数
+		String json = Codec.DoBase64.custom().setData(state).decodeAsText();
+		AuthRedirect re = Jsons.parseObject(json, AuthRedirect.class);
+		Boolean isNewUser = false;
 		if (user == null) {
+			isNewUser = true;
 			user = new User();
 			user.setNickname(String.format("%s%s", Constant.DEFAULT_NAME, Codec.DoDigest.custom().setAlgorithm(Codec.DoDigest.Algorithm.MD5).setStringData(RandomUtil.randomString(10)).toHexString().substring(0, 6)))
 					.setSex(info.getSex())
@@ -115,10 +126,12 @@ public class EventMsgService implements GzhMsgService {
 			user.setUnionid(info.getUnionid());
 			userMapper.insert(user);
 
-			Object sharedIdObj = redisService.get(RedisService.key.WX_GZH_QRCODE_SHARED_LOGIN.getNameFormat(sceneKey));
-			if (sharedIdObj != null) {
-				Long sharedId = Long.parseLong(sharedIdObj.toString());
-				distributeService.saveDistributionInvitation(sharedId, user.getId());
+			if (re != null) {
+				Long sharedId = re.getSharedId();
+				Integer dsType = re.getDsType();
+				if (dsType == null || dsType == 1) {
+					distributeService.saveDistributionInvitation(sharedId, user.getId());
+				}
 			}
 
 			saveGzhUserRelation(msgEvent, user.getId(), openId, info.getUnionid(), sceneKey);
@@ -134,10 +147,18 @@ public class EventMsgService implements GzhMsgService {
 		if (StrUtil.isNotEmpty(sceneKey)) {
 			redisService.set(RedisService.key.WX_GZH_QRCODE_LOGIN.getNameFormat(sceneKey), user.getId(), RedisService.key.WX_GZH_QRCODE_LOGIN.getTimeout());
 		}
+		if (re != null) {
+			Long sharedId = re.getSharedId();
+			Integer dsType = re.getDsType();
+			//新旧用户都可实物分销
+			if (dsType != null && dsType == 2) {
+				equipDistributeService.saveDistributionInvitation(sharedId, isNewUser, user.getId());
+			}
+		}
 		return true;
 	}
 
-	private void saveGzhUserRelation(MsgEvent msgEvent, Long userId, String openId, String unionid,String sceneKey) {
+	private void saveGzhUserRelation(MsgEvent msgEvent, Long userId, String openId, String unionid, String sceneKey) {
 		WxApp wxApp = wxAppMapper.selectOne(Wrappers.lambdaQuery(WxApp.class)
 				.eq(WxApp::getGzhOriginalId, msgEvent.getToUserName()).last("limit 1"));
 		if (wxApp != null) {

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

@@ -54,6 +54,7 @@ import com.cyksj.model.views.CouponNewUserView;
 import com.cyksj.model.views.CouponUserView;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.coupon.CouponFontService;
+import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
 import com.cyksj.service.exchange.ExchangeCodeService;
 import com.cyksj.service.mange.stock.GoodsDonStockService;
 import com.cyksj.service.market.MarketFrontService;
@@ -170,6 +171,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 	private final MarketFrontService marketFrontService;
 
+	private final EquipmentDistributeService equipmentDistributeService;
+
 	private final List<String> noChekGoodsTemp = List.of("Apple One", "Youtube", "Spotify");
 
 	@Transactional(rollbackFor = Throwable.class)
@@ -490,6 +493,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		TASK_POOL.execute(() -> {
 			try {
 				marketFrontService.addSpecificChanceNum(order.getUserId(), order.getId(), order.getGoodsId(), order.getSkuId());
+				if (goodsDon.getType() == 2) {
+					equipmentDistributeService.addDistributeBenefitsChance(order.getUserId(), order.getId());
+				}
 			} catch (Exception e) {
 				log.error("wx增加抽奖机会错误,orderId:{},error:{}", order.getId(), e);
 			}
@@ -761,6 +767,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		TASK_POOL.execute(() -> {
 			try {
 				marketFrontService.addSpecificChanceNum(orderDon.getUserId(), orderDon.getId(), orderDon.getGoodsId(), orderDon.getSkuId());
+				if (goodsDon.getType() == 2) {
+					equipmentDistributeService.subDistributeBenefitsChance(orderDon.getUserId(), orderDon.getId());
+				}
 			} catch (Exception e) {
 				log.error("zfb增加抽奖机会错误,orderId:{},error:{}", orderDon.getId(), e);
 			}
@@ -893,6 +902,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				goodsDonStockService.upStockRelate(null, orderDon.getId(),"refund");
 				try {
 					marketFrontService.subSpecificChanceNum(orderDon.getUserId(), orderDon.getId(), orderDon.getGoodsId(), orderDon.getUpdateTime());
+					if (goodsDon.getType() == 2) {
+						equipmentDistributeService.subDistributeBenefitsChance(orderDon.getUserId(), orderDon.getId());
+					}
 				} catch (Exception e) {
 					log.error("zfb减少抽奖机会错误,orderId:{},error:{}", orderDon.getId(), e);
 				}
@@ -1091,6 +1103,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		TASK_POOL.execute(()->{
 			try {
 				marketFrontService.subSpecificChanceNum(orderDon.getUserId(), orderDon.getId(), orderDon.getGoodsId(), orderDon.getUpdateTime());
+				GoodsDon goodsDon = goodsDonMapper.selectById(orderDon.getGoodsId());
+				if (goodsDon.getType() == 2) {
+					equipmentDistributeService.subDistributeBenefitsChance(orderDon.getUserId(), orderDon.getId());
+				}
 			} catch (Exception e) {
 				log.error("wx减少抽奖机会错误,orderId:{},error:{}", orderDon.getId(), e);
 			}

netflix-service/src/main/java/com/cyksj/service/relation/GroupRelationClearService.java

@@ -0,0 +1,17 @@
+package com.cyksj.service.relation;
+
+import com.cyksj.model.entity.GroupsRelation;
+
+/*
+ *项目名: netflix
+ *文件名: GroupRelationClearService
+ *创建者: JavaZou
+ *创建时间:2023/2/23 15:31
+ */
+public interface GroupRelationClearService {
+
+	/**
+	 * 清除车票
+	 */
+	void clearTicket(GroupsRelation relation);
+}

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

@@ -0,0 +1,73 @@
+package com.cyksj.service.relation.impl;
+
+import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.mapper.GroupsMapper;
+import com.cyksj.mapper.GroupsRelationMapper;
+import com.cyksj.mapper.UserTicketClearedRecordMapper;
+import com.cyksj.model.entity.GroupsRelation;
+import com.cyksj.model.entity.UserTicketClearedRecord;
+import com.cyksj.model.manage.views.GroupsRelationView;
+import com.cyksj.service.relation.GroupRelationClearService;
+import com.ejlchina.searcher.BeanSearcher;
+import com.ejlchina.searcher.util.MapUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/*
+ *项目名: netflix
+ *文件名: GroupRelationClearServiceImpl
+ *创建者: JavaZou
+ *创建时间:2023/2/23 15:31
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class GroupRelationClearServiceImpl implements GroupRelationClearService {
+	private final GroupsRelationMapper groupsRelationMapper;
+
+	private final GroupsMapper groupsMapper;
+
+	private final BeanSearcher beanSearcher;
+
+	private final UserTicketClearedRecordMapper userTicketClearedRecordMapper;
+
+	@Override
+	public void clearTicket(GroupsRelation relation) {
+			Long relationId = relation.getId();
+			Long userId = relation.getUserId();
+			Date startTime = relation.getStartTime();
+			Date expireTime = relation.getExpiryTime();
+			relation.setStartTime(null);
+			relation.setExpiryTime(null);
+			relation.setUserId(0l);
+			relation.setStatus(GroupsRelation.Status.none);
+			relation.setIsHandle(false);
+			relation.setRenewStatus(false);
+			relation.setAccount(null);
+			Integer success = groupsRelationMapper.updateExpiryTime(relation, expireTime);
+			if (success == 1) {
+				log.info("开始清除过期子账号,座位号:{}", relation.getId());
+				int count = groupsMapper.incrAvailableNum(relation.getGroupsId());
+				if (count == 0) {
+					log.error("车位异常 groupId:{}", relation.getGroupsId());
+					throw new BusinessRuntimeException("车位异常");
+				}
+				//记录用户被清除车票历史记录
+				GroupsRelationView groupsTrips = beanSearcher.searchFirst(GroupsRelationView.class,
+						MapUtils.builder().field(GroupsRelationView::getId, relationId).build());
+				if (groupsTrips != null) {
+					UserTicketClearedRecord userTicketClearedRecord = new UserTicketClearedRecord();
+					userTicketClearedRecord.setRelationId(relationId);
+					userTicketClearedRecord.setUserId(userId);
+					userTicketClearedRecord.setGoodsId(groupsTrips.getGoodsId());
+					userTicketClearedRecord.setSkuId(groupsTrips.getSkuId());
+					userTicketClearedRecord.setStartTime(startTime);
+					userTicketClearedRecord.setExpiryTime(expireTime);
+					userTicketClearedRecordMapper.insert(userTicketClearedRecord);
+				}
+			}
+	}
+}

netflix-service/src/main/java/com/cyksj/service/user/UserService.java

@@ -12,7 +12,7 @@ import com.cyksj.model.entity.WxSyncLog;
  */
 public interface UserService extends IService<User> {
 
-    User saveAuth(GzhOAuth2UserInfo userinfo, Long sharedId);
+    User saveAuth(GzhOAuth2UserInfo userinfo, Long sharedId, Integer dsType);
 
     UserWhoami whoami(long userId);
 

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -16,6 +16,7 @@ import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.UserTransferLog;
 import com.cyksj.model.entity.WxSyncLog;
 import com.cyksj.service.distribute.DistributeService;
+import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
 import com.cyksj.service.user.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -40,53 +41,61 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     private final DistributeService distributeService;
 
-    @Override
-    public User saveAuth(GzhOAuth2UserInfo info, Long sharedId) {
-        final String unionid = info.getUnionid();
-        if (StrUtil.isEmpty(unionid)) {
-            throw BusinessRuntimeException.getInstance("授权操作异常,请刷新页面");
-        }
-        WxSyncLog wxSyncLog = wxSyncLogMapper.selectOne(Wrappers.lambdaQuery(WxSyncLog.class)
-                .eq(WxSyncLog::getToAppid, weChatConfig.getAppid())
-                .eq(WxSyncLog::getNewOpenid, info.getOpenid()).last("limit 1"));
+	private final EquipmentDistributeService equipDistributeService;
 
-        User user = getSyncUser(info.getOpenid(), info.getUnionid(), wxSyncLog);
+	@Override
+	public User saveAuth(GzhOAuth2UserInfo info, Long sharedId, Integer dsType) {
+		final String unionid = info.getUnionid();
+		if (StrUtil.isEmpty(unionid)) {
+			throw BusinessRuntimeException.getInstance("授权操作异常,请刷新页面");
+		}
+		WxSyncLog wxSyncLog = wxSyncLogMapper.selectOne(Wrappers.lambdaQuery(WxSyncLog.class)
+				.eq(WxSyncLog::getToAppid, weChatConfig.getAppid())
+				.eq(WxSyncLog::getNewOpenid, info.getOpenid()).last("limit 1"));
 
-        user = Optional.ofNullable(user).orElseGet(() -> new User()
-                .setUnionid(unionid));
-        user.setNickname(info.getNickname())
-                .setSex(info.getSex())
-                .setCountry(info.getCountry())
-                .setProvince(info.getProvince())
-                .setCity(info.getCity())
-                .setHeadimgurl(info.getHeadimgurl());
-        if (!user.getUnionid().equals(unionid)) {
-            UserTransferLog log = new UserTransferLog();
-            if (wxSyncLog != null) {
-                log.setType("公众号迁移");
-            } else {
-                log.setType("绑定开发者账号");
-            }
-            log.setOldAppId(weChatConfig.getOldAppid());
-            log.setNewAppId(weChatConfig.getAppid());
-            log.setUserId(user.getId());
-            log.setOldUnionid(user.getUnionid());
-            log.setNewUnionid(info.getUnionid());
-            userTransferLogMapper.insert(log);
-        }
-        user.setUnionid(unionid);
-        user.setOpenId(info.getOpenid());
+		User user = getSyncUser(info.getOpenid(), info.getUnionid(), wxSyncLog);
 
-        Boolean isNewUser = false;
-        if (user.getId() == null) {
-            isNewUser = true;
-        }
-        this.saveOrUpdate(user);
-        if (sharedId != null && isNewUser) {
-            distributeService.saveDistributionInvitation(sharedId, user.getId());
-        }
-        return user;
-    }
+		user = Optional.ofNullable(user).orElseGet(() -> new User()
+				.setUnionid(unionid));
+		user.setNickname(info.getNickname())
+				.setSex(info.getSex())
+				.setCountry(info.getCountry())
+				.setProvince(info.getProvince())
+				.setCity(info.getCity())
+				.setHeadimgurl(info.getHeadimgurl());
+		if (!user.getUnionid().equals(unionid)) {
+			UserTransferLog log = new UserTransferLog();
+			if (wxSyncLog != null) {
+				log.setType("公众号迁移");
+			} else {
+				log.setType("绑定开发者账号");
+			}
+			log.setOldAppId(weChatConfig.getOldAppid());
+			log.setNewAppId(weChatConfig.getAppid());
+			log.setUserId(user.getId());
+			log.setOldUnionid(user.getUnionid());
+			log.setNewUnionid(info.getUnionid());
+			userTransferLogMapper.insert(log);
+		}
+		user.setUnionid(unionid);
+		user.setOpenId(info.getOpenid());
+
+		Boolean isNewUser = false;
+		if (user.getId() == null) {
+			isNewUser = true;
+		}
+		this.saveOrUpdate(user);
+		if (sharedId != null && isNewUser) {
+			if (dsType == null || dsType == 1) {
+				distributeService.saveDistributionInvitation(sharedId, user.getId());
+			}
+		}
+		//新旧用户都可实物分销
+		if (sharedId != null && dsType != null && dsType == 2) {
+			equipDistributeService.saveDistributionInvitation(sharedId, isNewUser, user.getId());
+		}
+		return user;
+	}
 
     @Override
     public UserWhoami whoami(long userId) {

netflix-service/src/main/java/com/cyksj/service/wechat/WeChatService.java

@@ -77,7 +77,7 @@ public interface WeChatService {
      * 获取公众号带参数的临时二维码
      * @return
      */
-    WxGzhQrCodeTicketRep getWxGzhQrCode(Long sharedId) throws Exception;
+    WxGzhQrCodeTicketRep getWxGzhQrCode(Long sharedId, Integer dsType) throws Exception;
 
     /**
      * 获取公众号带参数的永久二维码

netflix-service/src/main/java/com/cyksj/service/wechat/impl/WeChatServiceImpl.java

@@ -479,7 +479,7 @@ public class WeChatServiceImpl implements WeChatService {
     }
 
     @Override
-    public WxGzhQrCodeTicketRep getWxGzhQrCode(Long sharedId) throws Exception {
+    public WxGzhQrCodeTicketRep getWxGzhQrCode(Long sharedId, Integer dsType) throws Exception {
         String gzhQrCodeUrl = String.format("https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=%s", this.getAccessToken());
         //scene_str:场景值ID（字符串形式的ID），字符串类型，长度限制为1到64
         String scene_str = RandomUtil.randomString(16);
@@ -498,7 +498,9 @@ public class WeChatServiceImpl implements WeChatService {
         }
 
         if (sharedId != null) {
-            redisService.set(RedisService.key.WX_GZH_QRCODE_SHARED_LOGIN.getNameFormat(scene_str), sharedId, RedisService.key.WX_GZH_QRCODE_SHARED_LOGIN.getTimeout());
+            AuthRedirect redirect = new AuthRedirect().setSharedId(sharedId).setDsType(dsType);
+            String state = Codec.DoBase64.custom().setData(Jsons.toJson(redirect)).encodeAsText();
+            redisService.set(RedisService.key.WX_GZH_QRCODE_SHARED_LOGIN.getNameFormat(scene_str), state, RedisService.key.WX_GZH_QRCODE_SHARED_LOGIN.getTimeout());
         }
 
         JSONObject re = Jsons.parseObject(response.body(), JSONObject.class);

netflix-service/src/main/java/com/cyksj/task/Scheduler.java

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.constant.TemplateEnum;
-import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.RedisKey;
 import com.cyksj.mapper.*;
@@ -13,16 +12,14 @@ import com.cyksj.mapper.manage.distribute.DistributeWaitingSendPointsMapper;
 import com.cyksj.model.dto.WxMpTemplateData;
 import com.cyksj.model.dto.WxMpTemplateMessage;
 import com.cyksj.model.entity.*;
-import com.cyksj.model.manage.views.GroupsRelationView;
 import com.cyksj.model.views.WxAppTemplateView;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.order.OrderDonService;
 import com.cyksj.service.register.RegisterOrderDonService;
 import com.cyksj.service.register.SpotifyService;
+import com.cyksj.service.relation.GroupRelationClearService;
 import com.cyksj.service.template.TemplateCommonService;
 import com.cyksj.service.wechat.WeChatService;
-import com.ejlchina.searcher.BeanSearcher;
-import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DuplicateKeyException;
@@ -74,9 +71,7 @@ public class Scheduler {
 
         private final TemplateCommonService templateCommonService;
 
-        private final UserTicketClearedRecordMapper userTicketClearedRecordMapper;
-
-        private final BeanSearcher beanSearcher;
+        private final GroupRelationClearService groupRelationClearService;
 
 
     /**
@@ -89,7 +84,7 @@ public class Scheduler {
         List<GroupsRelation> expiryList = groupsRelationMapper.selectList(Wrappers.lambdaQuery(GroupsRelation.class).le(GroupsRelation::getExpiryTime, now));
         log.info("定时清理过期账号start ===> 数量:{}", expiryList.size());
         //过期账号清楚有效期
-        expiryList.forEach(relation -> delRelation(relation));
+        expiryList.forEach(relation -> groupRelationClearService.clearTicket(relation));
     }
 
     @Scheduled(cron = "0 0 9 * * ?")
@@ -154,43 +149,6 @@ public class Scheduler {
 
     }
 
-    private void delRelation(GroupsRelation relation) {
-        Long relationId = relation.getId();
-        Long userId = relation.getUserId();
-        Date startTime = relation.getStartTime();
-        Date expireTime = relation.getExpiryTime();
-        relation.setStartTime(null);
-        relation.setExpiryTime(null);
-        relation.setUserId(0l);
-        relation.setStatus(GroupsRelation.Status.none);
-        relation.setIsHandle(false);
-        relation.setRenewStatus(false);
-        relation.setAccount(null);
-        Integer success = groupsRelationMapper.updateExpiryTime(relation, expireTime);
-        if (success == 1) {
-            log.info("开始清除过期子账号,座位号:{}", relation.getId());
-            int count = groupsMapper.incrAvailableNum(relation.getGroupsId());
-            if (count == 0) {
-                log.error("车位异常 groupId:{}", relation.getGroupsId());
-                throw new BusinessRuntimeException("车位异常");
-            }
-            //记录用户被清除车票历史记录
-            GroupsRelationView groupsTrips = beanSearcher.searchFirst(GroupsRelationView.class,
-                    MapUtils.builder().field(GroupsRelationView::getId, relationId).build());
-            if (groupsTrips != null) {
-                UserTicketClearedRecord userTicketClearedRecord = new UserTicketClearedRecord();
-                userTicketClearedRecord.setRelationId(relationId);
-                userTicketClearedRecord.setUserId(userId);
-                userTicketClearedRecord.setGoodsId(groupsTrips.getGoodsId());
-                userTicketClearedRecord.setSkuId(groupsTrips.getSkuId());
-                userTicketClearedRecord.setStartTime(startTime);
-                userTicketClearedRecord.setExpiryTime(expireTime);
-                userTicketClearedRecordMapper.insert(userTicketClearedRecord);
-            }
-        }
-    }
-
-
     /**
      * 定时关闭订单
      */

netflix-web/src/main/java/com/cyksj/web/controller/distribute/EquipmentDistributeController.java

@@ -0,0 +1,157 @@
+package com.cyksj.web.controller.distribute;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.EnvCommonService;
+import com.cyksj.common.constant.Constant;
+import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.util.Jsons;
+import com.cyksj.dto.Result;
+import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.manage.distribute.equipment.EquipmentUserChanceMapper;
+import com.cyksj.model.dto.EquipmentConfigDto;
+import com.cyksj.model.entity.*;
+import com.cyksj.model.manage.views.GroupsRelationView;
+import com.cyksj.model.views.CouponUserView;
+import com.cyksj.model.views.EquipmentDistributeView;
+import com.cyksj.redis.RedisService;
+import com.cyksj.service.distribute.equipment.EquipmentDistributeFrontService;
+import com.cyksj.service.sys.SysConfigService;
+import com.cyksj.web.util.StpUserUtil;
+import com.ejlchina.searcher.BeanSearcher;
+import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
+import com.ejlchina.searcher.util.MapBuilder;
+import com.ejlchina.searcher.util.MapUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Optional;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentDistributeController
+ *创建者: JavaZou
+ *创建时间:2023/2/23 15:41
+ */
+@RestController
+@RequestMapping("/applets/equipment")
+@RequiredArgsConstructor
+public class EquipmentDistributeController {
+	private final EquipmentUserChanceMapper equipmentUserChanceMapper;
+
+	private final EnvCommonService envCommonService;
+
+	private final BeanSearcher beanSearcher;
+
+	private final HttpServletRequest request;
+
+	private final SysConfigService sysConfigService;
+
+	private final EquipmentDistributeFrontService equipmentDistributeFrontService;
+
+	private final RedisService redisService;
+
+	/**
+	 * 个人实物分销详情
+	 */
+	@GetMapping("/personal")
+	public Result<EquipmentDistributeView> getPersonalDetail() {
+		Long userId = StpUserUtil.getLoginIdAsLong();
+		EquipmentUserChance chance = equipmentUserChanceMapper.selectOne(Wrappers.lambdaQuery(EquipmentUserChance.class)
+				.eq(EquipmentUserChance::getUserId, userId).last("limit 1"));
+		EquipmentDistributeView view = new EquipmentDistributeView();
+		view.setNum(chance == null ? 0 : chance.getNum());
+		String encodeUrl = URLUtil.encode(String.format("%syinhe/web?sharedId=%s&dsType=%s", envCommonService.getDomain(), userId, 2));
+		view.setUrl(encodeUrl);
+		SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
+				.eq(SysConfig::getSysKey, Constant.EQUIPMENT_DISTRIBUTE_KEY).last("limit 1"));
+		if (config != null) {
+			view.setEquipmentConfig(config.getSysValue());
+		}
+		return GatewayResponse.SUCCESS.newBuilder().toResult(view);
+	}
+
+	/**
+	 * 邀请好友明细
+	 */
+	@GetMapping("/get/invite/record")
+	public Result<SearchResult<EquipmentUserChanceRecord>> getInviteRecord() {
+		Long userId = StpUserUtil.getLoginIdAsLong();
+		SearchResult<EquipmentUserChanceRecord> search = beanSearcher.search(EquipmentUserChanceRecord.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(EquipmentUserChanceRecord::getShareId, userId)
+				.build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+
+	/**
+	 * 增加权益的车票
+	 */
+	@GetMapping("/get/benefits/ticket")
+	public Result<List<GroupsRelationView>> getBenefitsTicket() throws Exception {
+		Long userId = StpUserUtil.getLoginIdAsLong();
+		SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
+				.eq(SysConfig::getSysKey, Constant.EQUIPMENT_DISTRIBUTE_KEY).last("limit 1"));
+		List<Long> goodsIdList = Jsons.parseList(config.getSysValue(), Long.class);
+		MapBuilder builder = MapUtils.builder()
+				.field(GroupsRelationView::getUserId, userId)
+				.field(GroupsRelationView::getGoodsType, 1)
+				.field(GroupsRelationView::getGoodsSecondType, 2)
+				.field(GroupsRelationView::getGoodsId, goodsIdList).op(Operator.InList)
+				.field(GroupsRelationView::getStatus, "validity")
+				.field(GroupsRelationView::getExpiryTime).op(Operator.NotNull);
+
+		List<GroupsRelationView> list = beanSearcher.searchAll(GroupsRelationView.class, builder.build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(list);
+	}
+
+	/**
+	 * 领取权益
+	 */
+	@PostMapping("/use/benefits")
+	public Result<GroupsRelationView> useBenefits(Long skuId) throws Exception {
+		Long userId = StpUserUtil.getLoginIdAsLong();
+		SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
+				.eq(SysConfig::getSysKey, Constant.EQUIPMENT_DISTRIBUTE_KEY).last("limit 1"));
+		String sysValue = config.getSysValue();
+		if (StrUtil.isEmpty(sysValue)) {
+			throw BusinessRuntimeException.getInstance("");
+		}
+		EquipmentConfigDto equipmentConfigDto = Jsons.parseObject(sysValue, EquipmentConfigDto.class);
+		Optional<GoodsDonSku> first = equipmentConfigDto.getSkuList().stream().filter(goodsDonSku -> {
+			if (goodsDonSku.getId().equals(skuId)) {
+				return true;
+			}
+			return false;
+		}).findFirst();
+		if (first.isEmpty()) {
+			throw BusinessRuntimeException.getInstance("暂无该车票权益");
+		}
+		GroupsRelationView groupsRelationView = equipmentDistributeFrontService.useBenefits(userId, skuId);
+		return GatewayResponse.SUCCESS.newBuilder().toResult(groupsRelationView);
+	}
+
+	/**
+	 * 新用户领取后分销优惠券后弹窗
+	 */
+	@GetMapping("/get/couponList")
+	public Result<List<CouponUserView>> getEquipmentCouponList() {
+		Long userId = StpUserUtil.getLoginIdAsLong();
+		Object value = redisService.get(RedisService.key.EQUIPMENT_DISTRIBUTE_COUPON_KEY.getNameFormat(userId));
+		if (value != null) {
+			List<CouponUserView> couponUserViews = beanSearcher.searchAll(CouponUserView.class, MapUtils.builder()
+					.field(CouponUserView::getUserId, userId)
+					.field(CouponUserView::getChannel, CouponUser.Channel.equipment.name())
+					.orderBy(CouponUserView::getOrderBy).asc()
+					.build());
+			return GatewayResponse.SUCCESS.newBuilder().toResult(couponUserViews);
+		}
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+}

netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -34,6 +34,7 @@ import com.cyksj.model.response.WxGzhQrCodeTicketRep;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.authorization.AuthorizationService;
 import com.cyksj.service.distribute.DistributeService;
+import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
 import com.cyksj.service.template.TemplateCommonService;
 import com.cyksj.service.user.UserService;
 import com.cyksj.service.wechat.WeChatService;
@@ -90,8 +91,10 @@ public class AuthorizationController {
 
     private final DistributeService distributeService;
 
+    private final EquipmentDistributeService equipDistributeService;
+
     @GetMapping(value = "/weChat")
-    public void base(String url,Long sharedId, String authType, HttpServletResponse response) throws Exception {
+    public void base(String url, Long sharedId, String authType, Integer dsType, HttpServletResponse response) throws Exception {
 
         log.info("微信授权转跳. url: {},authType:{}",url,authType);
 
@@ -101,7 +104,7 @@ public class AuthorizationController {
 
         Long mappingId = SEQUENCE.nextId();
         redisService.set(mappingId.toString(),url,60*60*24L);
-        AuthRedirect redirect = new AuthRedirect().setMappingId(mappingId).setSharedId(sharedId);
+        AuthRedirect redirect = new AuthRedirect().setMappingId(mappingId).setSharedId(sharedId).setDsType(dsType);
         String state = Codec.DoBase64.custom().setData(Jsons.toJson(redirect)).encodeAsText();
 
         response.sendRedirect(authorizationService.createUrl(state,authType));
@@ -127,7 +130,7 @@ public class AuthorizationController {
         GzhOAuth2UserInfo userinfo = weChatService.getUserInfo(token.getAccessToken(), token.getOpenid());
 
         //保存用户信息
-        User user = userService.saveAuth(userinfo, re.getSharedId());
+        User user = userService.saveAuth(userinfo, re.getSharedId(), re.getDsType());
 
         //写回登陆信息
         StpUserUtil.login(user.getId());
@@ -247,9 +250,9 @@ public class AuthorizationController {
      * 网页扫描微信公众号二维码 临时凭证ticket  关注后登录
      */
     @GetMapping("/wx/gzh/login/qrCode")
-    public Result<WxGzhQrCodeTicketRep> getWxGzhQrCode(Long sharedId) throws Exception {
+    public Result<WxGzhQrCodeTicketRep> getWxGzhQrCode(Long sharedId, Integer dsType) throws Exception {
         //获取gzh带参数的二维码
-        WxGzhQrCodeTicketRep result = weChatService.getWxGzhQrCode(sharedId);
+        WxGzhQrCodeTicketRep result = weChatService.getWxGzhQrCode(sharedId, dsType);
         return GatewayResponse.SUCCESS.newBuilder().toResult(result);
     }
 
@@ -382,7 +385,10 @@ public class AuthorizationController {
         //保存用户信息
         User user = userService.getOne(wrapper);
         Long sharedId = loginPhoneReq.getSharedId();
+        Integer distributeType = loginPhoneReq.getDsType();
+        Boolean isNewUser = false;
         if (user == null) {
+            isNewUser = true;
             user = new User();
             if (loginPhoneReq.getPopularizeId() != null) {
                 user.setPopularizeId(loginPhoneReq.getPopularizeId());
@@ -402,9 +408,15 @@ public class AuthorizationController {
             userService.save(user);
             //新用户分销
             if (sharedId != null) {
-                distributeService.saveDistributionInvitation(sharedId, user.getId());
+                if (distributeType == null || distributeType == 1) {
+                    distributeService.saveDistributionInvitation(sharedId, user.getId());
+                }
             }
         }
+        //新旧用户都可实物分销
+        if (sharedId != null && distributeType != null && distributeType == 2) {
+            equipDistributeService.saveDistributionInvitation(sharedId, isNewUser, user.getId());
+        }
         //写回登陆信息
         StpUserUtil.login(user.getId());
         LoginPhoneRep loginPhoneRep = new LoginPhoneRep(StpUserUtil.getTokenValue(), user.getId(), user.getNickname(), user.getHeadimgurl());