Merge remote-tracking branch 'origin/saas' into saas

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

@@ -167,4 +167,6 @@ public interface StudentPaymentOrderDetailDao extends BaseDAO<Long, StudentPayme
     List<Goods> getGoodsSellPrice(@Param("orderIds") List<Long> orderIds, @Param("type") String type);
 
     List<StudentPaymentOrderDetail> findByOrderId(Long paymentOrderId);
+
+    List<StudentPaymentOrderDetail> findByCalenderId(Long calenderId);
 }

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

@@ -66,6 +66,16 @@ public class StudentPaymentOrderDetail extends BaseEntity {
 	
 	private CloudTeacherOrderDto cloudTeacherOrderDto;
 
+	private Integer userId;
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -255,6 +255,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			Student student = studentDao.get(studentPaymentOrder.getUserId());
 			activityUserMapper.setUserId(studentPaymentOrder.getUserId());
 			activityUserMapper.setTeacherId(student.getTeacherId());
+			activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
 			if(orderDetail.getType() == OrderDetailTypeEnum.VIP){
 				activityUserMapper.setVipFlag(1);
 			}else {

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

@@ -703,11 +703,10 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = musicGroupPaymentCalenderDetailDao.queryDetailPage(params);
-			List<Long> orderIds = dataList.stream().map(e -> e.getPaymentOrderId()).collect(Collectors.toList());
-			List<StudentPaymentOrderDetail> orderDetail = studentPaymentOrderDetailDao.getOrderDetailByOrderId(orderIds);
-			Map<Long, List<StudentPaymentOrderDetail>> orderDetailMap = orderDetail.stream().collect(Collectors.groupingBy(StudentPaymentOrderDetail::getPaymentOrderId));
+			List<StudentPaymentOrderDetail> orderDetail = studentPaymentOrderDetailDao.findByCalenderId(dataList.get(0).getMusicGroupPaymentCalenderId());
+			Map<Integer, List<StudentPaymentOrderDetail>> orderDetailMap = orderDetail.stream().collect(Collectors.groupingBy(StudentPaymentOrderDetail::getUserId));
 			for (MusicGroupPaymentCalenderDetailDto row : dataList) {
-				List<StudentPaymentOrderDetail> orderDetailList = orderDetailMap.get(row.getPaymentOrderId());
+				List<StudentPaymentOrderDetail> orderDetailList = orderDetailMap.get(row.getUserId());
 				if(orderDetailList != null && orderDetailList.size() > 0){
 					BigDecimal totalAmount = orderDetailList.stream().map(e -> e.getPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
 					//辅件
@@ -724,6 +723,8 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 					row.setMaintenanceAmount(maintenanceAmount);
 					//活动
 					BigDecimal activityAmount = orderDetailList.stream().filter(e -> e.getType() == OrderDetailTypeEnum.PRACTICE || e.getType() == OrderDetailTypeEnum.VIP).map(e -> e.getPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
+					row.setActivityAmount(activityAmount);
+
 					totalAmount = totalAmount.subtract(accessoriesAmount).subtract(cloudAmount).subtract(musicalAmount).subtract(maintenanceAmount).subtract(activityAmount);
 					row.setCourseAmount(totalAmount);
 				}

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

@@ -83,6 +83,7 @@ public class SysCouponIssueRecordServiceImpl extends ServiceImpl<SysCouponIssueR
     }
 
     /**
+     * 学生端
      * 手动领取优惠券
      *
      * @param userId   用户id
@@ -145,6 +146,7 @@ public class SysCouponIssueRecordServiceImpl extends ServiceImpl<SysCouponIssueR
     }
 
     /**
+     * 学生端
      * 查询可以领取的优惠券
      *
      * @param userId 用户id

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

@@ -556,7 +556,8 @@
 		SELECT mgpcd.id_,mgpcd.user_id_,su.username_,st.name_ subject_names_,sr.music_group_status_,su.phone_,
 		CASE WHEN mgpcd.start_payment_date_ IS NULL THEN mgpc.start_payment_date_ ELSE mgpcd.start_payment_date_ END start_payment_date_mgpc_,
 		CASE WHEN mgpcd.deadline_payment_date_ IS NULL THEN mgpc.deadline_payment_date_ ELSE mgpcd.deadline_payment_date_ END deadline_payment_date_mgpc_,
-		CASE WHEN mgpc.status_ = 'OPEN' OR mgpcd.open_ = 1 THEN 1 ELSE 0 END open_,mgpc.payment_type_,mgpcd.payment_order_id_,mgpcd.payment_status_,mgpcd.pay_time_
+		CASE WHEN mgpc.status_ = 'OPEN' OR mgpcd.open_ = 1 THEN 1 ELSE 0 END open_,mgpc.payment_type_,mgpcd.payment_order_id_,mgpcd.payment_status_,mgpcd.pay_time_,
+		mgpcd.music_group_payment_calender_id_
 		FROM music_group_payment_calender_detail mgpcd
 		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
 		LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_

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

@@ -19,6 +19,7 @@
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="student_instrument_id_" property="studentInstrumentId"/>
         <result column="is_renew_" property="isRenew"/>
+        <result column="user_id_" property="userId"/>
         <collection property="goodsList" ofType="com.ym.mec.biz.dal.entity.Goods">
             <result column="goods_id_" property="id"/>
             <result column="goods_name_" property="name"/>
@@ -338,4 +339,13 @@
     <select id="findByOrderId" resultMap="StudentPaymentOrderDetail">
         SELECT * FROM student_payment_order_detail WHERE payment_order_id_ = #{paymentOrderId}
     </select>
+    <select id="findByCalenderId" resultMap="StudentPaymentOrderDetail">
+        SELECT spod.*,spo.user_id_ FROM student_payment_order spo
+        LEFT JOIN student_payment_order_detail spod  ON spo.id_ = spod.payment_order_id_
+        WHERE spo.id_ IN (
+        SELECT c.id_ FROM (SELECT payment_order_id_ id_ FROM music_group_payment_calender_detail
+        WHERE music_group_payment_calender_id_ = #{calenderId} AND payment_order_id_ IS NOT NULL
+        UNION
+        SELECT id_ FROM student_payment_order WHERE calender_id_ = #{calenderId} AND status_ = 'SUCCESS')c)
+    </select>
 </mapper>

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

@@ -113,7 +113,7 @@
         <set>
             stock_count_ = stock_count_ - #{param.exchangeNum},
             consume_num_ =consume_num_ + #{param.exchangeNum},
-            <if test="warningStatus != null">
+            <if test="param.warningStatus != null">
                 warning_status_ = #{param.warningStatus},
             </if>
             update_time_ = NOW()

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

@@ -169,20 +169,25 @@ public class MusicGroupController extends BaseController {
                         flag = false;
                     }
                 }
-                //是否购买会员
-                if(Objects.nonNull(calenderDetail.get("member"))){
-                    if(typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER) || typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS)){
-                        flag = true;
-                    }else {
-                        flag = false;
+
+                if(!flag){
+                    //是否购买会员
+                    if(Objects.nonNull(calenderDetail.get("member"))){
+                        if(typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER) || typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS)){
+                            flag = true;
+                        }else {
+                            flag = false;
+                        }
                     }
                 }
-                //是否购买活动包
-                if(Objects.nonNull(calenderDetail.get("activity"))){
-                    if(typeList.contains(OrderDetailTypeEnum.VIP) || typeList.contains(OrderDetailTypeEnum.PRACTICE)){
-                        flag = true;
-                    }else {
-                        flag = false;
+                if(!flag){
+                    //是否购买活动包
+                    if(Objects.nonNull(calenderDetail.get("activity"))){
+                        if(typeList.contains(OrderDetailTypeEnum.VIP) || typeList.contains(OrderDetailTypeEnum.PRACTICE)){
+                            flag = true;
+                        }else {
+                            flag = false;
+                        }
                     }
                 }
                 if(flag){

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

@@ -7,13 +7,16 @@ import com.ym.mec.biz.service.SysCouponCodeService;
 import com.ym.mec.biz.service.SysCouponIssueRecordService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.common.page.WrapperUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+import java.util.Optional;
 
 @RequestMapping("sysCouponCode")
 @Api(tags = "优惠券明细")
@@ -57,4 +60,31 @@ public class SysCouponCodeController extends BaseController {
         return succeed(sysCouponCodeService.exchangeCouponTest(sysUser.getId(), couponId, paymentOrderId, exchangeNum));
     }
 
+    /**
+     * 手动领取优惠券
+     *
+     * @param param userId 领取者id
+     * @param param couponId 优惠券id
+     */
+    @ApiOperation("手动领取优惠券")
+    @PostMapping(value = "/manualIssueCoupon")
+    public HttpResponseResult manualIssueCoupon(@RequestBody Map<String, Object> param) {
+        Integer couponId = WrapperUtil.toInt(param, "couponId", "传入参数错误!");
+        couponIssueRecordService.manualIssueCoupon(getUserId(), couponId);
+        return succeed();
+    }
+
+    @ApiOperation("查询优惠券发放记录")
+    @GetMapping(value = "/queryCanBeGet")
+    public HttpResponseResult queryCanBeGetCoupon() {
+        return succeed(couponIssueRecordService.queryCanBeGetCoupon(getUserId()));
+    }
+
+    private Integer getUserId() {
+        //修改机构基础信息
+        return Optional.ofNullable(sysUserFeignService.queryUserInfo())
+                .map(SysUser::getId)
+                .orElseThrow(() -> new BizException("用户信息获取失败,重新登录!"));
+    }
+
 }

mec-web/src/main/java/com/ym/mec/web/controller/SysCouponIssueRecordController.java

@@ -62,21 +62,6 @@ public class SysCouponIssueRecordController extends BaseController {
     }
 
     /**
-     * 手动领取优惠券
-     *
-     * @param param userId 领取者id
-     * @param param couponId 优惠券id
-     */
-    @ApiOperation("手动领取优惠券")
-    @PostMapping(value = "/manualIssueCoupon")
-    public HttpResponseResult manualIssueCoupon(@RequestBody Map<String, Object> param) {
-        Integer userId = WrapperUtil.toInt(param, "userId", "传入参数错误!");
-        Integer couponId = WrapperUtil.toInt(param, "couponId", "传入参数错误!");
-        couponIssueRecordService.manualIssueCoupon(userId, couponId);
-        return succeed();
-    }
-
-    /**
      * 查询优惠券发放名单
      *
      * @param param issueId 发放记录id
@@ -96,11 +81,5 @@ public class SysCouponIssueRecordController extends BaseController {
         return succeed(couponIssueRecordService.queryIssueRecord(param));
     }
 
-    @ApiOperation("查询优惠券发放记录")
-    @GetMapping(value = "/queryCanBeGet")
-    public HttpResponseResult queryCanBeGetCoupon(Integer userId) {
-        return succeed(couponIssueRecordService.queryCanBeGetCoupon(userId));
-    }
-
 }