fix 去掉商务默认提成比例,使用平台默认比例

netflix-dao/src/main/java/com/cyksj/mapper/shop/YhShopGeneralGoodsRateMapper.java

@@ -1,13 +0,0 @@
-package com.cyksj.mapper.shop;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.YhShopGeneralGoodsRate;
-
-/*
- *项目名: yhlxj
- *文件名: YhShopGeneralGoodsRateMapper
- *创建者: JavaZou
- *创建时间:2023/9/15 17:35
- */
-public interface YhShopGeneralGoodsRateMapper extends BaseMapper<YhShopGeneralGoodsRate> {
-}

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

@@ -1,18 +0,0 @@
-package com.cyksj.model.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/*
- *项目名: yhlxj
- *文件名: YhShopGeneralGoodsRate
- *创建者: JavaZou
- *创建时间:2023/9/15 17:35
- */
-@Getter
-@Setter
-public class YhShopGeneralGoodsRate extends BaseEntity{
-	private Long goodsId;
-
-	private Integer rate;
-}

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

@@ -1,29 +0,0 @@
-package com.cyksj.model.views;
-
-import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.SearchBean;
-import lombok.Getter;
-import lombok.Setter;
-
-/*
- *项目名: yhlxj
- *文件名: ShopGeneralGoodsRateView
- *创建者: JavaZou
- *创建时间:2023/9/18 11:09
- */
-@Getter
-@Setter
-@SearchBean(tables = "(select * from goods_don where type = 1 and status is true and deleted is true and is_distribute is true) g left join yh_shop_general_goods_rate yr on yr.goods_id = g.id")
-public class ShopGeneralGoodsRateView {
-	@DbField("yr.id")
-	private Long id;
-
-	@DbField("g.id")
-	private Long goodsId;
-
-	@DbField("g.title")
-	private String title;
-
-	@DbField("ifnull(yr.rate,0)")
-	private Integer rate;
-}

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

@@ -126,6 +126,9 @@ public class DistributeServiceImpl implements DistributeService {
 				.eq(YhShop::getUserId, userDistribute.getUserId())
 				.eq(YhShop::getVerifyStatus, YhShop.Status.success).last("limit 1"));
 		for (UserPlatDistributeRate rate : userDistributeReq.getRates()) {
+			if (rate.getRate() == null) {
+				rate.setRate(0);
+			}
 			if (rate.getRate() < 0 || rate.getRate() > 100) {
 				throw new BusinessRuntimeException("比例错误");
 			}

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

@@ -10,7 +10,6 @@ import com.cyksj.mapper.manage.distribute.UserBusinessDefaultRateConfigMapper;
 import com.cyksj.mapper.manage.distribute.UserDistributeBusinessOrderDonRecordMapper;
 import com.cyksj.mapper.manage.distribute.UserDistributeBusinessRateMapper;
 import com.cyksj.mapper.shop.YhShopUserDistributeBusinessOrderDonRecordMapper;
-import com.cyksj.mapper.shop.YhShopUserDistributeBusinessRateMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.distribute.UserBusinessFrontService;
@@ -46,9 +45,7 @@ public class UserBusinessFrontServiceImpl implements UserBusinessFrontService {
 
 	private final UserBusinessDefaultRateConfigMapper defaultRateConfigMapper;
 
-	private final UserDistributeSpecialMapper UserDistributeSpecialMapper;
-
-	private final YhShopUserDistributeBusinessRateMapper yhShopUserDistributeBusinessRateMapper;
+	private final UserDistributeSpecialMapper userDistributeSpecialMapper;
 
 	private final YhShopUserDistributeBusinessOrderDonRecordMapper yhShopBusinessOrderDonRecordMapper;
 
@@ -63,7 +60,7 @@ public class UserBusinessFrontServiceImpl implements UserBusinessFrontService {
 		}
 		UserDistributeBusinessRate businessRate = userDistributeBusinessRateMapper.selectOne(wrapper);
 		//06-21 奈飞平台商务比例特殊处理
-		UserDistributeSpecial userDistributeSpecial = UserDistributeSpecialMapper.selectOne(Wrappers.lambdaQuery(UserDistributeSpecial.class)
+		UserDistributeSpecial userDistributeSpecial = userDistributeSpecialMapper.selectOne(Wrappers.lambdaQuery(UserDistributeSpecial.class)
 				.eq(UserDistributeSpecial::getSkuId, order.getSkuId())
 				.eq(UserDistributeSpecial::getSharedId, sharedId)
 				.eq(UserDistributeSpecial::getBusinessId, businessId)
@@ -184,7 +181,7 @@ public class UserBusinessFrontServiceImpl implements UserBusinessFrontService {
 		//和渠道商务用一套提成比例
 		UserDistributeBusinessRate businessRate = userDistributeBusinessRateMapper.selectOne(wrapper);
 		//06-21 奈飞平台商务比例特殊处理
-		UserDistributeSpecial userDistributeSpecial = UserDistributeSpecialMapper.selectOne(Wrappers.lambdaQuery(UserDistributeSpecial.class)
+		UserDistributeSpecial userDistributeSpecial = userDistributeSpecialMapper.selectOne(Wrappers.lambdaQuery(UserDistributeSpecial.class)
 				.eq(UserDistributeSpecial::getSkuId, order.getSkuId())
 				.eq(UserDistributeSpecial::getSharedId, shopUserId)
 				.eq(UserDistributeSpecial::getBusinessId, businessId)

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

@@ -13,8 +13,6 @@ import java.util.List;
  *创建时间:2023/9/15 17:26
  */
 public interface CmsYhShopCommonService {
-	void setGeneralGoodsRate(List<YhShopGeneralGoodsRate> rates);
-
 	void verifyYhShopApply(YhShopVerifyReq verifyReq);
 
 	void setYhShopGoodsRate(List<YhShopUserPlatDistributeRate> yhShopUserPlatDistributeRates, Long businessId, Long userId);

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

@@ -1,7 +1,6 @@
 package com.cyksj.service.mange.goods;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
@@ -16,7 +15,6 @@ import com.cyksj.model.request.YhShopVerifyReq;
 import com.cyksj.model.views.GoodsDonSkuView;
 import com.cyksj.service.mange.CmsYhShopCommonService;
 import com.cyksj.service.mange.business.UserBusinessRateService;
-import com.cyksj.service.shop.YhShopGeneralGoodsRateService;
 import com.cyksj.service.shop.YhShopUserPlatDistributeRateService;
 import com.cyksj.service.user.UserBenefitsService;
 import com.ejlchina.searcher.BeanSearcher;
@@ -28,7 +26,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -44,8 +41,6 @@ import java.util.Optional;
 public class CmsYhShopCommonServiceImpl implements CmsYhShopCommonService {
 	private final GoodsDonMapper goodsDonMapper;
 
-	private final YhShopGeneralGoodsRateService yhShopGeneralGoodsRateService;
-
 	private final YhShopMapper yhShopMapper;
 
 	private final YhShopApplyRecordMapper yhShopApplyRecordMapper;
@@ -69,24 +64,6 @@ public class CmsYhShopCommonServiceImpl implements CmsYhShopCommonService {
 	private final UserDistributeMapper userDistributeMapper;
 
 	private final YhShopUserPlatDistributeRateMapper yhShopUserPlatDistributeRateMapper;
-	@Override
-	public void setGeneralGoodsRate(List<YhShopGeneralGoodsRate> rates) {
-		List<YhShopGeneralGoodsRate> saveShopGoodsRate = new ArrayList<>(rates.size());
-		rates.forEach(data -> {
-			Integer rate = data.getRate();
-			Long goodsId = data.getGoodsId();
-			if (goodsId != null && rate != null && rate >= 0 && rate <= 100) {
-				GoodsDon goodsDon = goodsDonMapper.selectById(goodsId);
-				if (goodsDon != null) {
-					saveShopGoodsRate.add(data);
-				}
-			}
-		});
-
-		if (CollUtil.isNotEmpty(saveShopGoodsRate)) {
-			yhShopGeneralGoodsRateService.saveOrUpdateBatch(saveShopGoodsRate);
-		}
-	}
 
 	@Override
 	@Transactional(rollbackFor = Throwable.class)

netflix-service/src/main/java/com/cyksj/service/shop/YhShopGeneralGoodsRateService.java

@@ -1,13 +0,0 @@
-package com.cyksj.service.shop;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.cyksj.model.entity.YhShopGeneralGoodsRate;
-
-/*
- *项目名: yhlxj
- *文件名: YhShopGeneralGoodsRateService
- *创建者: JavaZou
- *创建时间:2023/9/21 17:06
- */
-public interface YhShopGeneralGoodsRateService extends IService<YhShopGeneralGoodsRate> {
-}

netflix-service/src/main/java/com/cyksj/service/shop/impl/YhShopDistributeServiceImpl.java

@@ -37,8 +37,6 @@ public class YhShopDistributeServiceImpl implements YhShopDistributeService {
 
 	private final UserBenefitsService userBenefitsService;
 
-	private final YhShopGeneralGoodsRateMapper yhShopGeneralGoodsRateMapper;
-
 	private final GoodsDonMapper goodsDonMapper;
 	@Override
 	public void distributeWaitingSendPointsRecord(OrderDon order) {
@@ -75,18 +73,13 @@ public class YhShopDistributeServiceImpl implements YhShopDistributeService {
 				.eq(YhShopUserPlatDistributeRate::getGoodsId, order.getGoodsId()).last("limit 1"));
 		Integer rate = null;
 		if (yhShopUserPlatDistributeRate == null) {
-			log.info("未配置店铺主userId:{}对应平台goodsId:{}的比例,走通用比例", shopUserId, order.getGoodsId());
+			log.info("未配置店铺主userId:{}对应平台goodsId:{}的比例,走商品通用比例", shopUserId, order.getGoodsId());
 		} else {
 			rate = yhShopUserPlatDistributeRate.getRate();
 		}
 		if (rate == null) {
-			//获取平台配置的通用比例
-			YhShopGeneralGoodsRate yhShopGeneralGoodsRate = yhShopGeneralGoodsRateMapper.selectOne(Wrappers.lambdaQuery(YhShopGeneralGoodsRate.class)
-					.eq(YhShopGeneralGoodsRate::getGoodsId, order.getGoodsId()).last("limit 1"));
-			if (yhShopGeneralGoodsRate != null) {
-				log.info("店铺通用比例为:{}", yhShopGeneralGoodsRate.getRate());
-				rate = yhShopGeneralGoodsRate.getRate();
-			}
+			//未配置比例 默认使用 平台的分销比例
+			rate = goodsDon.getRate();
 		}
 		if (rate == null || rate <= 0) {
 			log.info("配置店铺主userId:{}对应平台goodsId:{}的比例为0", shopUserId, order.getGoodsId());

netflix-service/src/main/java/com/cyksj/service/shop/impl/YhShopGeneralGoodsRateServiceIImpl.java

@@ -1,20 +0,0 @@
-package com.cyksj.service.shop.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cyksj.mapper.shop.YhShopGeneralGoodsRateMapper;
-import com.cyksj.model.entity.YhShopGeneralGoodsRate;
-import com.cyksj.service.shop.YhShopGeneralGoodsRateService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/*
- *项目名: yhlxj
- *文件名: YhShopGeneralGoodsRateServiceIImpl
- *创建者: JavaZou
- *创建时间:2023/9/21 17:06
- */
-
-@Service
-@RequiredArgsConstructor
-public class YhShopGeneralGoodsRateServiceIImpl extends ServiceImpl<YhShopGeneralGoodsRateMapper, YhShopGeneralGoodsRate> implements YhShopGeneralGoodsRateService {
-}

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/shop/CmsYhShopGoodsController.java

@@ -131,26 +131,6 @@ public class CmsYhShopGoodsController {
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
 
-    /**
-     * 设置店铺平台通用 分销比例配置
-     */
-    @PutMapping("/set/distribute/general/goods/rate")
-    public Result<String> setGeneralGoodsRate(@RequestBody List<YhShopGeneralGoodsRate> rates) {
-        cmsYhShopCommonService.setGeneralGoodsRate(rates);
-        return GatewayResponse.SUCCESS.newBuilder().toResult();
-    }
-
-    /**
-     * 通用平台分销比例展示
-     */
-    @GetMapping("/get/distribute/general/goods/rate")
-    public Result<List<ShopGeneralGoodsRateView>> getShopGeneralGoodsRate() {
-        List<ShopGeneralGoodsRateView> shopGeneralGoodsRateViews = beanSearcher.searchAll(ShopGeneralGoodsRateView.class, MapUtils.builder()
-                .orderBy(ShopGeneralGoodsRateView::getGoodsId).asc()
-                .build());
-        return GatewayResponse.SUCCESS.newBuilder().toResult(shopGeneralGoodsRateViews);
-    }
-
     /**
      * 店铺管理列表
      */