Merge branch 'zx_saas_goods' of http://git.dayaedu.com/yonge/mec into test

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

@@ -888,7 +888,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                             multiply(new BigDecimal(t.getGoodsNum()))).reduce(BigDecimal.ZERO, BigDecimal::add);
 
             String[] goodsIds = goodsIdsStr.split(",");
-            BigDecimal subTotalPrice = totalGroupPurchasePrice;
+            BigDecimal subTotalPrice = studentPaymentOrder.getExpectAmount();
             for (int i = 0; i < goodsIds.length; i++) {
                 String goodsIdStr = goodsIds[i];
                 if (StringUtils.isBlank(goodsIdStr)) {