Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -299,6 +299,15 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             subjectChange.setStatus(SubjectChangeStatusEnum.SUCCESSED);
             subjectChange.setUpdateTime(nowDate);
+            subjectChange.setSellTime(nowDate);
+
+            //乐器辅件价差大于0时，有销售金额
+            if (studentPaymentOrder.getActualAmount().compareTo(BigDecimal.ZERO) > 0) {
+                BigDecimal sellAmount = studentPaymentOrder.getActualAmount().multiply(subjectChange.getGoodsMargin())
+                        .divide(studentPaymentOrder.getExpectAmount(), 2, BigDecimal.ROUND_HALF_UP);
+                subjectChange.setSellAmount(sellAmount);
+            }
+
             if (this.update(subjectChange) <= 0) {
                 throw new BizException("维修单更新失败");
             }