渠道推广固定关系改为30天;店铺商务提成用渠道商务设置的提成比例

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

@@ -174,15 +174,25 @@ public class UserBusinessFrontServiceImpl implements UserBusinessFrontService {
 	 */
 	@Override
 	public void taskYhShopDistributeRateBenefits(Long shopUserId, Long businessId, Integer goodsType, OrderDon order, Integer distributeRate) {
-		LambdaQueryWrapper<YhShopUserDistributeBusinessRate> wrapper = Wrappers.lambdaQuery(YhShopUserDistributeBusinessRate.class)
-				.eq(YhShopUserDistributeBusinessRate::getBusinessId, businessId)
-				.eq(YhShopUserDistributeBusinessRate::getGoodsId, order.getGoodsId())
+		LambdaQueryWrapper<UserDistributeBusinessRate> wrapper = Wrappers.lambdaQuery(UserDistributeBusinessRate.class)
+				.eq(UserDistributeBusinessRate::getBusinessId, businessId)
+				.eq(UserDistributeBusinessRate::getGoodsId, order.getGoodsId())
 				.last("limit 1");
-		//虚拟平台
 		if (goodsType == 1) {
-			wrapper.eq(YhShopUserDistributeBusinessRate::getSkuId, order.getSkuId());
+			wrapper.eq(UserDistributeBusinessRate::getSkuId, order.getSkuId());
+		}
+		//和渠道商务用一套提成比例
+		UserDistributeBusinessRate businessRate = userDistributeBusinessRateMapper.selectOne(wrapper);
+		//06-21 奈飞平台商务比例特殊处理
+		UserDistributeSpecial userDistributeSpecial = UserDistributeSpecialMapper.selectOne(Wrappers.lambdaQuery(UserDistributeSpecial.class)
+				.eq(UserDistributeSpecial::getSkuId, order.getSkuId())
+				.eq(UserDistributeSpecial::getSharedId, shopUserId)
+				.eq(UserDistributeSpecial::getBusinessId, businessId)
+				.last("limit 1"));
+		if (userDistributeSpecial != null) {
+			businessRate.setFirstOrderRate(userDistributeSpecial.getFirstRate());
+			businessRate.setRenewOrderRate(userDistributeSpecial.getRenewRate());
 		}
-		YhShopUserDistributeBusinessRate businessRate = yhShopUserDistributeBusinessRateMapper.selectOne(wrapper);
 		if (businessRate != null) {
 			if (order.getOrderType() == 1) {
 				//实物商务分销提成 无首单

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

@@ -2514,12 +2514,12 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					if (!userDistributeShared.getIsBind()) {
 						orderDon.setIsDistribute(false);
 					} else {
-						//45天内是否下单成功
+						//45天内是否下单成功 ==>改为30天
 						Date createdTime = userDistributeShared.getCreatedTime();
-						DateTime forty_five = DateUtil.offsetDay(createdTime, 45);
+						DateTime time = DateUtil.offsetDay(createdTime, 30);
 						//在45天内
 						Boolean is_fit = false;
-						boolean before = DateTime.now().isBefore(forty_five);
+						boolean before = DateTime.now().isBefore(time);
 						//超过45天还未下过单
 						//直接不参与后续的 提成
 						if (before) {
@@ -2528,7 +2528,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 							int count = this.count(Wrappers.lambdaQuery(OrderDon.class)
 									.eq(OrderDon::getUserId, userId)
 									.notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
-									.le(OrderDon::getCreatedTime, forty_five));
+									.le(OrderDon::getCreatedTime, time));
 							if (count > 0) {
 								is_fit = true;
 							} else {