|
@@ -382,7 +382,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
subjectChange.setStatus(SubjectChangeStatusEnum.SUCCESSED);
|
|
subjectChange.setStatus(SubjectChangeStatusEnum.SUCCESSED);
|
|
|
|
|
|
//乐器辅件价差大于0时,有销售金额
|
|
//乐器辅件价差大于0时,有销售金额
|
|
- if (studentPaymentOrder.getActualAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
|
|
|
+ if (subjectChange.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.GROUP) && studentPaymentOrder.getActualAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
BigDecimal sellAmount = studentPaymentOrder.getActualAmount().multiply(subjectChange.getGoodsMargin())
|
|
BigDecimal sellAmount = studentPaymentOrder.getActualAmount().multiply(subjectChange.getGoodsMargin())
|
|
.divide(studentPaymentOrder.getExpectAmount(), 2, BigDecimal.ROUND_HALF_UP);
|
|
.divide(studentPaymentOrder.getExpectAmount(), 2, BigDecimal.ROUND_HALF_UP);
|
|
subjectChange.setSellAmount(sellAmount);
|
|
subjectChange.setSellAmount(sellAmount);
|