Merge branch 'online1'

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

@@ -409,7 +409,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             confirm.put("div_members", divMembers);
             try {
                 Map<String, Object> map = Payment.createConfirm(confirm);
-                LOGGER.info("分账信息返回：",map);
+                LOGGER.info("分账信息返回：{}",map);
             } catch (Exception e) {
                 continue;
             }

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

@@ -640,7 +640,22 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     type = OrderDetailTypeEnum.TEACHING;
                 }
                 studentPaymentOrderDetail4goodsGroup.setType(type);
-                studentPaymentOrderDetail4goodsGroup.setPrice(goodsGroup.getPrice());
+                
+                BigDecimal goodsPrice = new BigDecimal(0);
+                
+                if(studentRegistration.getOrganId() == 55 && (newCourses == null || newCourses.size() == 0) && !(buyCloudTeacher || buyCloudTeacherPlus)){
+                	//取商品零售价
+                    if (StringUtils.isNotBlank(goodsGroup.getGoodsIdList())) {
+                    	List<Goods> goodsList = goodsDao.findGoodsByIds(goodsGroup.getGoodsIdList());
+                    	for(Goods goods : goodsList){
+                    		goodsPrice = goodsPrice.add(goods.getMarketPrice());
+                    	}
+                    }
+                }else{
+                	goodsPrice = goodsGroup.getPrice();
+                }
+                studentPaymentOrderDetail4goodsGroup.setPrice(goodsPrice);
+                
                 studentPaymentOrderDetail4goodsGroup.setGoodsIdList(goodsGroup.getGoodsIdList());
                 studentPaymentOrderDetail4goodsGroup.setCreateTime(date);
                 studentPaymentOrderDetail4goodsGroup.setUpdateTime(date);