|
@@ -1531,6 +1531,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
log.info("分销订单orderId:{}对应平台goodsId:{}不存在或已不参与分成比例", order.getId(), order.getGoodsId());
|
|
log.info("分销订单orderId:{}对应平台goodsId:{}不存在或已不参与分成比例", order.getId(), order.getGoodsId());
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
+ if (order.getSkuId() != null) {
|
|
|
|
|
+ goodsDonSku = goodsDonSkuMapper.selectById(order.getSkuId());
|
|
|
|
|
+ }
|
|
|
UserDistributeShared userDistributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class).eq(UserDistributeShared::getUserId, order.getUserId()).last("limit 1"));
|
|
UserDistributeShared userDistributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class).eq(UserDistributeShared::getUserId, order.getUserId()).last("limit 1"));
|
|
|
if (userDistributeShared != null) {
|
|
if (userDistributeShared != null) {
|
|
|
distributeWaitingSendPoints.setSharedId(userDistributeShared.getSharedId());
|
|
distributeWaitingSendPoints.setSharedId(userDistributeShared.getSharedId());
|
|
@@ -1554,7 +1557,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
rate = goodsDon.getRate();
|
|
rate = goodsDon.getRate();
|
|
|
//实物分销比例
|
|
//实物分销比例
|
|
|
if (goodsDon.getType() == 2) {
|
|
if (goodsDon.getType() == 2) {
|
|
|
- goodsDonSku = goodsDonSkuMapper.selectById(order.getSkuId());
|
|
|
|
|
if (goodsDonSku != null) {
|
|
if (goodsDonSku != null) {
|
|
|
//不包含套餐权益
|
|
//不包含套餐权益
|
|
|
if (!goodsDonSku.getIsBenefits()) {
|
|
if (!goodsDonSku.getIsBenefits()) {
|