|
@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
|
|
|
import com.ym.mec.biz.dal.entity.*;
|
|
|
import com.ym.mec.biz.dal.enums.DealStatusEnum;
|
|
|
import com.ym.mec.biz.dal.enums.GoodsType;
|
|
|
+import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
|
|
|
import com.ym.mec.biz.service.*;
|
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
|
import org.snaker.engine.core.OrderService;
|
|
@@ -18,6 +19,7 @@ import com.ym.mec.common.dal.BaseDAO;
|
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -142,13 +144,28 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
|
|
|
//乐团计划及收费信息
|
|
|
MusicGroupSubjectPlan musicOneSubjectClassPlan = this.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
|
|
|
musicOneSubjectClassPlan.setFee(studentRegistration.getTemporaryCourseFee());
|
|
|
+
|
|
|
+ //乐团乐器及辅件信息
|
|
|
+ List<MusicGroupSubjectGoodsGroup> goodsGroups = new ArrayList<>();
|
|
|
|
|
|
List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
|
|
|
-
|
|
|
- String goodsIds = orderDetails.stream().filter(orderDetail -> orderDetail.getGoodsIdList() != null).map(orderDetail -> orderDetail.getGoodsIdList()).collect(Collectors.joining(","));
|
|
|
-
|
|
|
- List<Goods> goodies = goodsService.findGoodsByIds(goodsIds);
|
|
|
-
|
|
|
+ for (StudentPaymentOrderDetail orderDetail : orderDetails) {
|
|
|
+ if (orderDetail.getGoodsIdList() == null || orderDetail.getGoodsIdList().isEmpty()) continue;
|
|
|
+ MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
|
|
|
+ if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL)) {
|
|
|
+ musicGroupSubjectGoodsGroup.setName("乐器");
|
|
|
+ musicGroupSubjectGoodsGroup.setType(GoodsType.INSTRUMENT);
|
|
|
+ } else {
|
|
|
+ musicGroupSubjectGoodsGroup.setName("辅件");
|
|
|
+ musicGroupSubjectGoodsGroup.setType(GoodsType.ACCESSORIES);
|
|
|
+ }
|
|
|
+ musicGroupSubjectGoodsGroup.setId(orderDetail.getId());
|
|
|
+ musicGroupSubjectGoodsGroup.setMusicGroupId(musicGroupId);
|
|
|
+ musicGroupSubjectGoodsGroup.setPrice(orderDetail.getPrice());
|
|
|
+ List<Goods> goodies = goodsService.findGoodsByIds(orderDetail.getGoodsIdList());
|
|
|
+ musicGroupSubjectGoodsGroup.setGoodsList(goodies);
|
|
|
+ goodsGroups.add(musicGroupSubjectGoodsGroup);
|
|
|
+ }
|
|
|
|
|
|
//获取声部(科目)下其他商品
|
|
|
List<Goods> otherGoods = goodsService.findTypeGoods("OTHER");
|
|
@@ -156,7 +173,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
|
|
|
MusicGroupSubjectGoodsAndInfoDto musicGroupSubjectGoodsAndInfo = new MusicGroupSubjectGoodsAndInfoDto();
|
|
|
musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectPlan(musicOneSubjectClassPlan);
|
|
|
musicGroupSubjectGoodsAndInfo.setCourseScheduleInfo(courseForm);
|
|
|
- musicGroupSubjectGoodsAndInfo.setStudentGoods(goodies);
|
|
|
+ musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
|
|
|
musicGroupSubjectGoodsAndInfo.setOtherGoods(otherGoods);
|
|
|
return musicGroupSubjectGoodsAndInfo;
|
|
|
}
|
|
@@ -164,6 +181,6 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
|
|
|
|
|
|
@Override
|
|
|
public MusicGroupSubjectPlan findSubjectPlan(String musicGroupId, Integer subjectId) {
|
|
|
- return musicGroupSubjectPlanDao.findSubjectPlan(musicGroupId,subjectId);
|
|
|
+ return musicGroupSubjectPlanDao.findSubjectPlan(musicGroupId, subjectId);
|
|
|
}
|
|
|
}
|