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

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

@@ -71,7 +71,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
             subjectChange.setOriginalMusicalGoods(goodsDao.get(subjectChange.getOriginalMusical()));
         }
         if (subjectChange.getOriginalAccessories() != null) {
-            subjectChange.setChangeAccessoriesGoods(goodsDao.findGoodsByIds(subjectChange.getOriginalAccessories()));
+            subjectChange.setOriginalAccessoriesGoods(goodsDao.findGoodsByIds(subjectChange.getOriginalAccessories()));
         }
 
         if (subjectChange.getChangeMusical() != null) {
@@ -117,9 +117,11 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
 
         studentPaymentOrderService.insert(studentPaymentOrder);
         studentPaymentOrder.setVersion(0);
-
+        if (amount.compareTo(viewAmount) != 0) {
+            throw new BizException("价格异常");
+        }
         BigDecimal balance = BigDecimal.ZERO;
-        if (isUseBalancePayment != null && amount.compareTo(BigDecimal.ZERO) > 0) {
+        if (isUseBalancePayment != null && isUseBalancePayment && amount.compareTo(BigDecimal.ZERO) > 0) {
             SysUserCashAccount userCashAccount = sysUserCashAccountService.getLocked(subjectChange.getStudentId());
             if (userCashAccount == null) {
                 throw new BizException("用户账户找不到");

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

@@ -163,7 +163,7 @@
                 trans_no_ = #{transNo},
             </if>
             <if test="status != null">
-                status_ = #{status},
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="paymentChannel != null">
                 payment_channel_=#{paymentChannel},