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

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

@@ -102,4 +102,11 @@ public interface StudentPaymentOrderDetailDao extends BaseDAO<Long, StudentPayme
      * @return
      */
     List<StudentPaymentOrderDetail> getStudentApplyDetail(@Param("studentId") Integer studentId, @Param("musicGroupId") String musicGroupId);
+
+    /**
+     * 获取购买乐器的方式
+     * @param paymentOrderNo
+     * @return
+     */
+    List<Map<Long, String>> queryPurchaseTypeMap(@Param("paymentOrderNo") List<Long> paymentOrderNo);
 }

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

@@ -251,7 +251,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         Map<Long, BigDecimal> musicalAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo, "MUSICAL"));
         Map<Long, BigDecimal> accessoriesAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo, "ACCESSORIES"));
         Map<Long, BigDecimal> courseAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo, "COURSE"));
-        Map<Long, String> purchaseTypeMap = MapUtil.convertIntegerMap(studentRegistrationDao.queryPurchaseTypeMap(musicGroupId));
+        Map<Long, String> purchaseTypeMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryPurchaseTypeMap(paymentOrderNo));
         Map<Integer, String> userSubjectMap = subjectDao.getRegisterSubject(musicGroupId, userIds).stream().collect(Collectors.toMap(StudentRegistration::getUserId, StudentRegistration::getSubjectName));
 
         musicalListDetailDtos.forEach(e -> {
@@ -264,9 +264,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             e.setOrderAmount(actualAmountMap.get(e.getPaymentOrderId()));
             e.setCourseAmount(courseAmountMap.get(e.getPaymentOrderId()));
             e.setSubjectName(userSubjectMap.get(e.getUserId()));
-            String s = purchaseTypeMap.get(e.getUserId().longValue());
+            String s = purchaseTypeMap.get(e.getPaymentOrderId());
             if (StringUtils.isNotEmpty(s)) {
-                e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(purchaseTypeMap.get(e.getUserId().longValue())));
+                e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(purchaseTypeMap.get(e.getPaymentOrderId())));
             }
         });
         List<SubjectChange> studentGoodies = subjectChangeDao.getStudentGoods(musicGroupId);

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

@@ -364,6 +364,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         subjectChange.setUpdateTime(nowDate);
         subjectChange.setTransNo(studentPaymentOrder.getTransNo());
         subjectChange.setMerNo(studentPaymentOrder.getMerNos());
+        subjectChange.setPaymentChannel(studentPaymentOrder.getPaymentChannel());
 
         Integer userId = studentPaymentOrder.getUserId();
 

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

@@ -227,4 +227,14 @@
           AND spo.type_ = 'APPLY'
           AND spod.type_ IN ('MUSICAL', 'ACCESSORIES', 'TEACHING', 'OTHER', 'COURSE')
     </select>
+
+    <select id="queryPurchaseTypeMap" resultType="java.util.Map">
+        SELECT payment_order_id_ 'key',kit_group_purchase_type_ 'value'
+        FROM student_payment_order_detail
+        WHERE payment_order_id_ IN
+        <foreach collection="paymentOrderNo" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+        AND type_='MUSICAL'
+    </select>
 </mapper>