乐团乐器提供方式增加减免课程费用

乐团增加可选课程费用

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDetailDao.java

@@ -78,4 +78,11 @@ public interface StudentPaymentOrderDetailDao extends BaseDAO<Long, StudentPayme
      * @return
      */
     StudentPaymentOrderDetail findApplyOrderMusical(@Param("orderId") Long orderId);
+
+    /**
+     *
+     * @param orderId
+     * @return
+     */
+    List<String> getOrderDetailType(@Param("orderId") Long orderId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderDetailService.java

@@ -70,4 +70,11 @@ public interface StudentPaymentOrderDetailService extends BaseService<Long, Stud
      * @return
      */
     StudentPaymentOrderDetail findApplyOrderMusical(Long orderId);
+
+    /**
+     * 获取订单类型的详情
+     * @param orderId
+     * @return
+     */
+    List<String> getOrderDetailType(Long orderId);
 }

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

@@ -211,4 +211,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     public StudentPaymentOrderDetail findApplyOrderMusical(Long orderId) {
         return studentPaymentOrderDetailDao.findApplyOrderMusical(orderId);
     }
+
+    @Override
+    public List<String> getOrderDetailType(Long orderId) {
+        return studentPaymentOrderDetailDao.getOrderDetailType(orderId);
+    }
 }

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

@@ -163,4 +163,8 @@
     <select id="findApplyOrderMusical" resultMap="StudentPaymentOrderDetail">
         SELECT * FROM student_payment_order_detail WHERE payment_order_id_ = #{orderId} AND type_ = 'MUSICAL' LIMIT 1
     </select>
+
+    <select id="getOrderDetailType" resultType="java.lang.String">
+        SELECT DISTINCT type_ FROM student_payment_order_detail WHERE payment_order_id_ = 41300 #{orderId}
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -129,9 +129,11 @@ public class StudentOrderController extends BaseController {
         if (orderByOrderNo.getGroupType().equals(GroupType.MUSIC)) {
             MusicGroup musicGroup = musicGroupService.get(orderByOrderNo.getMusicGroupId());
             List<Goods> goodsList = studentPaymentOrderDetailService.findApplyOrderGoods(orderByOrderNo.getId());
+            List<String> orderDetailType = studentPaymentOrderDetailService.getOrderDetailType(orderByOrderNo.getId());
             orderDetail.put("goods", goodsList);
             orderDetail.put("course", musicGroup.getCourseForm());
             orderDetail.put("ownershipType", musicGroup.getOwnershipType());
+            orderDetail.put("detailType",orderDetailType);
         } else if (orderByOrderNo.getGroupType().equals(GroupType.VIP)) {
             VipBuyResultDto vipBuyResultInfo = vipGroupService.findVipBuyResultInfo(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
             orderDetail.put("detail", vipBuyResultInfo);