update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPaymentOrderDetail.java

@@ -1,12 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.dto.CloudTeacherOrderDto;
+import com.ym.mec.biz.dal.enums.CouponDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
@@ -15,6 +17,7 @@ import java.util.List;
 /**
  * 对应数据库表(student_payment_order_detail):
  */
+@Data
 public class StudentPaymentOrderDetail extends BaseEntity {
 
 	/**  */
@@ -78,6 +81,16 @@ public class StudentPaymentOrderDetail extends BaseEntity {
 	
 	private String deliveryBatchNo;//发货批次
 
+	private CouponDetailTypeEnum couponDetailTypeEnum;
+
+	public CouponDetailTypeEnum getCouponDetailTypeEnum() {
+		return couponDetailTypeEnum;
+	}
+
+	public void setCouponDetailTypeEnum(CouponDetailTypeEnum couponDetailTypeEnum) {
+		this.couponDetailTypeEnum = couponDetailTypeEnum;
+	}
+
 	public Integer getUserId() {
 		return userId;
 	}

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

@@ -818,8 +818,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (Objects.nonNull(couponPayParam) && Objects.nonNull(couponPayParam.getCouponTypeInfo())) {
             //如果买乐器送课,那么就是0元买课，那么就先剔除送的课程再算优惠券，但是写入数据流水要加上
             List<StudentPaymentOrderDetail> collect = new ArrayList<>();
-            //按OrderDetailTypeEnum类型 进行聚合分组
-            Map<OrderDetailTypeEnum, List<StudentPaymentOrderDetail>> orderDetailGroupList;
             BigDecimal freeNewCourse = BigDecimal.ZERO;
             //如果送课 并且 课程不为空,那么就是0元买课
             if (goodsDto.isRemitCourseRFeeFlag() && CollectionUtils.isNotEmpty(newCourses)) {
@@ -833,17 +831,14 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                         .filter(a -> newCourseType.contains(a.getType().getCode()))
                         .map(StudentPaymentOrderDetail::getRemitFee)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
-                orderDetailGroupList =
-                        WrapperUtil.groupList(collect, StudentPaymentOrderDetail::getType);
             } else {
-                orderDetailGroupList =
-                        WrapperUtil.groupList(studentPaymentOrderDetailList, StudentPaymentOrderDetail::getType);
+                collect = studentPaymentOrderDetailList;
             }
 
             //获取本次交易中各优惠券的使用信息
             Map<String, CouponPayTypeInfo> couponParam = couponPayParam.getCouponTypeInfo();
             //计算使用优惠券后的对应的商品应该均摊的金额
-            calculateCoupon(couponParam, orderDetailGroupList);
+            calculateCoupon(couponParam, collect);
             //获取使用了优惠券之后的总金额
             BigDecimal useCouponAmount = WrapperUtil.sumList(studentPaymentOrderDetailList, StudentPaymentOrderDetail::getRemitFee);
             //赋值
@@ -991,14 +986,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
      * @param couponParam          优惠券的信息
      * @param orderDetailGroupList 订单信息
      */
-    private void calculateCoupon(Map<String, CouponPayTypeInfo> couponParam,
-                                 Map<OrderDetailTypeEnum, List<StudentPaymentOrderDetail>> orderDetailGroupList) {
+    private void calculateCoupon(Map<String, CouponPayTypeInfo> couponParam,List<StudentPaymentOrderDetail> paymentOrderDetails) {
         List<StudentPaymentOrderDetail> singleTypeList = new ArrayList<>();
         List<StudentPaymentOrderDetail> allTypeList = new ArrayList<>();
+        paymentOrderDetails.forEach(e->e.setCouponDetailTypeEnum(CouponDetailTypeEnum.valueOf(CouponDetailTypeEnum.of(e.getType().getCode()))));
+        Map<CouponDetailTypeEnum, List<StudentPaymentOrderDetail>> orderDetailGroupList = paymentOrderDetails.stream().collect(Collectors.groupingBy(e -> e.getCouponDetailTypeEnum()));
         //先处理”非全类型券“的数据
         orderDetailGroupList.forEach((e, list) -> {
             //根据OrderDetailTypeEnum类型找到对应的券类型，默认全类型
-            String couponDetailCode = CouponDetailTypeEnum.of(e.getCode());
+            String couponDetailCode = e.getCode();
             //获取本次支付中该类型优惠券的详情，如果该商品没有找到本次支付时选择的优惠券则当作全类型
             CouponPayTypeInfo couponPayTypeInfo = couponParam.get(couponDetailCode);
             //全类型券数据后面处理

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

@@ -122,8 +122,8 @@ public class StudentVisitServiceImpl extends BaseServiceImpl<Integer, StudentVis
             Map<Integer, SimpleUserDto> userDtoMap = userDtos.stream().collect(Collectors.groupingBy(e -> e.getUserId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
             Map<String,List<Integer>> visitMap = new HashMap<>();
             for (StudentVisit visit : studentVisits) {
-                visit.setType("其他");
-                visit.setPurpose("其他");
+                visit.setType("其它");
+                visit.setPurpose("其它");
                 visit.setTeacherId(userId);
                 visit.setVisiterType(visitType);
                 SimpleUserDto userDto = userDtoMap.get(visit.getStudentId());

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

@@ -250,7 +250,8 @@
         select COUNT(sov.user_id_) from student_operating_visit sov
         LEFT JOIN sys_user su ON su.id_ = sov.user_id_
         LEFT JOIN (select sv.student_id_,MAX(sv.create_time_) create_time_ from student_visit sv
-        where sv.student_id_ IS NOT NULL group by sv.student_id_,DATE_FORMAT(sv.create_time_,'%Y-%m')) sv ON sv.student_id_ = sov.user_id_ AND sov.month_ = DATE_FORMAT(sv.create_time_,'%Y-%m')
+        where sv.student_id_ IS NOT NULL group by sv.student_id_,DATE_FORMAT(sv.create_time_,'%Y-%m')) sv ON sv.student_id_ = sov.user_id_
+        AND sov.month_ = DATE_FORMAT(sv.create_time_,'%Y-%m')
         <include refid="queryWaitVisitSql"/>
     </select>
     <sql id="queryWaitVisitSql">