浏览代码

经营报表修改

周箭河 4 年之前
父节点
当前提交
face11dcec
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

@@ -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);