fix 逻辑删除

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

@@ -17,7 +17,7 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "order_don od left join user_distribute_shared uds on uds.user_id = od.user_id" +
-		" left join user_distribute ud on ud.user_id = uds.shared_id" +
+		" left join user_distribute ud on ud.user_id = uds.shared_id and ud.deleted is true" +
 		" left join distribute_waiting_send_points dp on dp.order_id = od.id",
 where = "od.is_distribute is true and od.status not in ('close','noPayment')")
 public class DistributeOrdersView {

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

@@ -32,7 +32,7 @@ public class DistributeServiceImpl implements DistributeService {
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
 	public void insertDistribute(UserDistributeReq userDistributeReq) {
-		UserDistribute exists = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class).eq(UserDistribute::getUserId, userDistributeReq.getUserId()).last("limit 1"));
+		UserDistribute exists = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class).eq(UserDistribute::getUserId, userDistributeReq.getUserId()).eq(UserDistribute::getDeleted, true).last("limit 1"));
 		if (exists != null) {
 			throw BusinessRuntimeException.getInstance("该推广者已添加");
 		}