fix 个人推广优惠码

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

@@ -1,6 +1,5 @@
 package com.cyksj.model.entity;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -32,6 +31,5 @@ public class CouponDistributePopularize extends BaseEntity {
 	 */
 	private String exCode;
 
-	@TableLogic(value = "1", delval = "0")
 	private Boolean deleted;
 }

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

@@ -354,6 +354,7 @@ public class DistributeServiceImpl implements DistributeService {
 		if (userDistribute != null) throw BusinessRuntimeException.getInstance("只适用于普通用户进行专属推广");
 		CouponDistributePopularize is_exists = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class)
 				.eq(CouponDistributePopularize::getUserId, userId)
+				.eq(CouponDistributePopularize::getDeleted, true)
 				.last("limit 1"));
 		if (is_exists != null) throw BusinessRuntimeException.getInstance("你已设置专属推广优惠码");
 		CouponDistributePopularize couponDistributePopularize = new CouponDistributePopularize();
@@ -363,7 +364,6 @@ public class DistributeServiceImpl implements DistributeService {
 		CouponDistributePopularize exists = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class)
 				.eq(CouponDistributePopularize::getExCode, code)
 				.eq(CouponDistributePopularize::getDeleted, true)
-				.ne(CouponDistributePopularize::getUserId, userId)
 				.select(CouponDistributePopularize::getId)
 				.last("limit 1"));
 		if (exists != null) {

netflix-service/src/main/java/com/cyksj/service/mange/coupon/impl/CouponCommonServiceImpl.java

@@ -130,7 +130,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 			throw BusinessRuntimeException.getInstance("优惠券推广者关联id为空");
 		}
 		CouponDistributePopularize entity = couponDistributePopularizeMapper.selectById(couponDistributePopularize.getId());
-		if (entity == null) {
+		if (entity == null || !entity.getDeleted()) {
 			throw BusinessRuntimeException.getInstance("该优惠券推广关联记录不存在");
 		}
 		if (StrUtil.isEmpty(couponDistributePopularize.getExCode())) {

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

@@ -2042,7 +2042,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		UserDistributeShared userDistributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class)
 				.eq(UserDistributeShared::getUserId, userId).last("limit 1"));
 		if (userDistributeShared == null) {
-			CouponDistributePopularize couponDistributePopularize = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getExCode, couponExCode).last("limit 1"));
+			CouponDistributePopularize couponDistributePopularize = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getExCode, couponExCode).eq(CouponDistributePopularize::getDeleted, 1).last("limit 1"));
 			Optional.ofNullable(couponDistributePopularize).ifPresent(popularize -> {
 				try {
 					Long sharedId;

netflix-web/src/main/java/com/cyksj/web/controller/manage/coupon/CouponController.java

@@ -189,7 +189,7 @@ public class CouponController {
 	public Result<SearchResult<CouponView>> couponList(HttpServletRequest request) {
 		SearchResult<CouponView> search = beanSearcher.search(CouponView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		search.getDataList().forEach(data -> {
-			data.setRelationNum(couponDistributePopularizeMapper.selectCount(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getCouponId, data.getId())));
+			data.setRelationNum(couponDistributePopularizeMapper.selectCount(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getDeleted, 1).eq(CouponDistributePopularize::getCouponId, data.getId())));
 
 			Map<String, Long> couponUserNumData = couponUserMapper.selectCouponUserNumData(data.getId());
 			Integer usedNum = Integer.parseInt(couponUserNumData.get("usedNum").toString());

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

@@ -140,7 +140,8 @@ public class DistributeController {
 			//保存商务人员提成比例
 			userBusinessRateService.saveBusinessRate(businessId);
 			//清除 之前有普通推广专属码
-			couponDistributePopularizeMapper.delete(Wrappers.lambdaQuery(CouponDistributePopularize.class)
+			couponDistributePopularizeMapper.update(null, Wrappers.lambdaUpdate(CouponDistributePopularize.class)
+					.set(CouponDistributePopularize::getDeleted, 0)
 					.eq(CouponDistributePopularize::getUserId, userDistributeReq.getUserId())
 					.eq(CouponDistributePopularize::getIsGeneral, true));
 		} catch (Exception e) {

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

@@ -160,9 +160,10 @@ public class DistributePopularizeController {
 			distributePopularizeView.setIsGeneral(true);
 			distributePopularizeView.setHighestRate(goodsDon.getRate());
 			Optional.ofNullable(couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class)
-					.eq(CouponDistributePopularize::getUserId, userId)
-					.eq(CouponDistributePopularize::getIsGeneral, true)
-					.last("limit 1")))
+							.eq(CouponDistributePopularize::getUserId, userId)
+							.eq(CouponDistributePopularize::getIsGeneral, true)
+							.eq(CouponDistributePopularize::getDeleted, 1)
+							.last("limit 1")))
 					.ifPresent(couponPopularize -> {
 						Coupon coupon = couponMapper.getCouponById(couponPopularize.getCouponId());
 						distributePopularizeView.setGeneralCode(couponPopularize.getExCode());