|
|
@@ -1042,7 +1042,6 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
|
|
|
if (upgradeSku.getGoodsId() != Constant.CLAUDE_CODE_GOODS_ID) {
|
|
|
return BigDecimal.ZERO;
|
|
|
}
|
|
|
- GoodsDon goodsDon = goodsDonMapper.selectById(upgradeSku.getGoodsId());
|
|
|
GoodsDonSku relationPresentSku = null;
|
|
|
Long renewSkuId = claudeCodeUser.getRenewSkuId();
|
|
|
if (renewSkuId != null) {
|
|
|
@@ -1212,9 +1211,9 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
|
|
|
for (OrderDon orderDon : orderDonList) {
|
|
|
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));
|
|
|
- if (thisOrderMoney.compareTo(BigDecimal.ZERO) == 0) {
|
|
|
- thisOrderMoney = sku.getPrice();
|
|
|
- }
|
|
|
+// if (thisOrderMoney.compareTo(BigDecimal.ZERO) == 0) {
|
|
|
+// thisOrderMoney = sku.getPrice();
|
|
|
+// }
|
|
|
totalOrderMoney = totalOrderMoney.add(thisOrderMoney);
|
|
|
//总时间
|
|
|
if (sku.getDays() != null) {
|