|
|
@@ -2821,7 +2821,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
takeMoney = takeMoney.add(userDistributeEquipment.getApTv());
|
|
|
}
|
|
|
//包含套餐
|
|
|
- if (goodsDonSku.getSpecJson().contains("套餐")) {
|
|
|
+ if (userDistributeEquipment.getCombo() != null && userDistributeEquipment.getCombo().compareTo(BigDecimal.ZERO) > 0 && goodsDonSku.getSpecJson().contains("套餐")) {
|
|
|
GoodsDonSpec goodsDonSpec = goodsDonSpecMapper.selectOne(Wrappers.lambdaQuery(GoodsDonSpec.class)
|
|
|
.eq(GoodsDonSpec::getGoodsId, orderDon.getGoodsId()).last("limit 1"));
|
|
|
List<ReqGoodsSkuSpec> specs = Jsons.parseList(goodsDonSpec.getSpecsJson(), ReqGoodsSkuSpec.class);
|