|
@@ -1211,9 +1211,9 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
|
|
|
for (OrderDon orderDon : orderDonList) {
|
|
for (OrderDon orderDon : orderDonList) {
|
|
|
GoodsDonSku sku = skuMapper.selectById(skuId);
|
|
GoodsDonSku sku = skuMapper.selectById(skuId);
|
|
|
BigDecimal thisOrderMoney = orderDon.getMoney().add(Optional.ofNullable(orderDon.getBalance()).orElse(BigDecimal.ZERO)).subtract(Optional.ofNullable(orderDon.getRefundMoney()).orElse(BigDecimal.ZERO));
|
|
BigDecimal thisOrderMoney = orderDon.getMoney().add(Optional.ofNullable(orderDon.getBalance()).orElse(BigDecimal.ZERO)).subtract(Optional.ofNullable(orderDon.getRefundMoney()).orElse(BigDecimal.ZERO));
|
|
|
-// if (thisOrderMoney.compareTo(BigDecimal.ZERO) == 0) {
|
|
|
|
|
-// thisOrderMoney = sku.getPrice();
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if (thisOrderMoney.compareTo(BigDecimal.ZERO) == 0) {
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
totalOrderMoney = totalOrderMoney.add(thisOrderMoney);
|
|
totalOrderMoney = totalOrderMoney.add(thisOrderMoney);
|
|
|
//总时间
|
|
//总时间
|
|
|
if (sku.getDays() != null) {
|
|
if (sku.getDays() != null) {
|