update 订单导出增加新生课程专享

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

@@ -179,7 +179,19 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         BigDecimal goodsMargin = subjectChange.getChangeMusicalPrice().add(subjectChange.getChangeAccessoriesPrice())
                 .subtract(subjectChange.getOriginalMusicalPrice()).subtract(subjectChange.getOriginalAccessoriesPrice());
         subjectChange.setGoodsMargin(goodsMargin);
-        subjectChange.setCostMargin(subjectChange.getChangeCost().subtract(subjectChange.getOriginalCost()));
+        String goodsIds = "";
+        if (subjectChange.getChangeMusical() != null) {
+            goodsIds += subjectChange.getMusicGroupId() + "";
+        }
+        if (subjectChange.getChangeMusical() != null) {
+            goodsIds += StringUtils.isNotBlank(goodsIds) ? "," + subjectChange.getChangeAccessories() : subjectChange.getChangeAccessories();
+        }
+        BigDecimal goodsPrice = BigDecimal.ZERO;
+        List<Goods> goodies = goodsDao.findGoodsByIds(goodsIds);
+        for (Goods goods : goodies) {
+            goodsPrice = goodsPrice.add(goods.getDiscountPrice());
+        }
+        subjectChange.setChangeCost(goodsPrice);
         subjectChange.setCostMargin(subjectChange.getChangeCost().subtract(subjectChange.getOriginalCost()));
         //差价 <= 0
         BigDecimal amountMargin = subjectChange.getGoodsMargin().add(subjectChange.getCourseMargin());
@@ -194,6 +206,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         }
         subjectChange.setCreateTime(nowDate);
         subjectChange.setUpdateTime(nowDate);
+        subjectChange.setVersion(0);
         subjectChangeDao.insert(subjectChange);
         return subjectChange;
     }

mec-biz/src/main/resources/config/mybatis/SubjectChangeMapper.xml

@@ -74,8 +74,8 @@
         #{originalAccessories}, #{originalAccessoriesPrice},#{originalCost},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{changeCourseFee},
         #{changeMusical},
         #{changeMusicalPrice}, #{changeAccessories}, #{changeAccessoriesPrice},#{changeCost}, #{goodsMargin},
-        #{courseMargin},#{costMargin}
-        #{sellAmount},#{orderId},#{orderNo},#{transNo},#{status},#{sellTime}, #{createTime}, #{updateTime},#{version})
+        #{courseMargin},#{costMargin},
+        #{sellAmount},#{orderId},#{orderNo},#{transNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sellTime}, #{createTime}, #{updateTime},#{version})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SubjectChange">
         <!--@mbg.generated-->