|
|
@@ -64,13 +64,13 @@ public class YhShopDistributeServiceImpl implements YhShopDistributeService {
|
|
|
YhShopUserPlatDistributeRate yhShopUserPlatDistributeRate = yhShopUserPlatDistributeRateMapper.selectOne(Wrappers.lambdaQuery(YhShopUserPlatDistributeRate.class)
|
|
|
.eq(YhShopUserPlatDistributeRate::getUserId, shopUserId)
|
|
|
.eq(YhShopUserPlatDistributeRate::getGoodsId, order.getGoodsId()).last("limit 1"));
|
|
|
- Integer rate = 0;
|
|
|
+ Integer rate = null;
|
|
|
if (yhShopUserPlatDistributeRate == null) {
|
|
|
log.info("未配置店铺主userId:{}对应平台goodsId:{}的比例,走通用比例", shopUserId, order.getGoodsId());
|
|
|
} else {
|
|
|
rate = yhShopUserPlatDistributeRate.getRate();
|
|
|
}
|
|
|
- if (rate <= 0) {
|
|
|
+ if (rate == null) {
|
|
|
//获取平台配置的通用比例
|
|
|
YhShopGeneralGoodsRate yhShopGeneralGoodsRate = yhShopGeneralGoodsRateMapper.selectOne(Wrappers.lambdaQuery(YhShopGeneralGoodsRate.class)
|
|
|
.eq(YhShopGeneralGoodsRate::getGoodsId, order.getGoodsId()).last("limit 1"));
|