Merge remote-tracking branch 'origin/master'

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

@@ -20,8 +20,16 @@ public interface SubjectChangeDao extends BaseDAO<Integer, SubjectChange> {
 
     /**
      * 获取更换详情
+     *
      * @param id
      * @return
      */
     SubjectChange getChangeInfo(@Param("id") Integer id);
+
+    /**
+     * 获取待支付的的声部更换列表
+     * @param musicGroupId
+     * @return
+     */
+    List<SubjectChange> getMusicGroupWaitPay(@Param("musicGroupId") String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentApplyDetailDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,6 +59,9 @@ public class StudentApplyDetailDto{
     @ApiModelProperty(value = "备注",required = false)
     private String remark;
 
+    @ApiModelProperty(value = "声部更换详情",required = false)
+    private SubjectChange subjectChange;
+
     public KitGroupPurchaseTypeEnum getKitGroupPurchaseTypeEnum() {
         return kitGroupPurchaseTypeEnum;
     }
@@ -177,4 +181,12 @@ public class StudentApplyDetailDto{
     public void setId(Long id) {
         this.id = id;
     }
+
+    public SubjectChange getSubjectChange() {
+        return subjectChange;
+    }
+
+    public void setSubjectChange(SubjectChange subjectChange) {
+        this.subjectChange = subjectChange;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/GoodsSellQueryInfo.java

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.dal.page;
 
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -13,7 +12,7 @@ public class GoodsSellQueryInfo extends QueryInfo {
 	private Integer studentId;
 
 	@ApiModelProperty(value = "交易状态",required = true)
-	private DealStatusEnum status;
+	private String status;
 
 	public Integer getTeacherId() {
 		return teacherId;
@@ -31,11 +30,11 @@ public class GoodsSellQueryInfo extends QueryInfo {
 		this.studentId = studentId;
 	}
 
-	public DealStatusEnum getStatus() {
+	public String getStatus() {
 		return status;
 	}
 
-	public void setStatus(DealStatusEnum status) {
+	public void setStatus(String status) {
 		this.status = status;
 	}
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.StudentGoodsSellDto;
 import com.ym.mec.biz.dal.entity.StudentGoodsSell;
+import com.ym.mec.biz.dal.page.GoodsSellQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
@@ -18,5 +19,5 @@ public interface StudentGoodsSellService extends BaseService<Integer, StudentGoo
      * @param queryInfo:
      * @return java.lang.Object
      */
-    PageInfo<StudentGoodsSellDto> queryStudentGoodsOrders(QueryInfo queryInfo);
+    PageInfo<StudentGoodsSellDto> queryStudentGoodsOrders(GoodsSellQueryInfo queryInfo);
 }

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

@@ -26,4 +26,11 @@ public interface SubjectChangeService extends BaseService<Integer, SubjectChange
      * @return
      */
     SubjectChange addChange(SubjectChange subjectChange);
+
+    /**
+     * 取消声部更换
+     * @param id
+     * @return
+     */
+    SubjectChange cancel(Integer id);
 }

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

@@ -157,7 +157,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		Date date = new Date();
 		String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);
 		//将有效期已截止的学员缴费信息修改为未缴费
-		musicGroupStudentFeeDao.updateFeeStatus();
+//		musicGroupStudentFeeDao.updateFeeStatus();
 		//获取距离缴费开启指定天数后的缴费明细
 		String configValue = sysConfigDao.findConfigValue("push_payment_detail");
 		Map<Long, Long> maps = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryCalenderByDay(configValue));

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

@@ -4,6 +4,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.biz.dal.dao.StudentGoodsSellDao;
 import com.ym.mec.biz.dal.dto.StudentGoodsSellDto;
 import com.ym.mec.biz.dal.entity.StudentGoodsSell;
+import com.ym.mec.biz.dal.page.GoodsSellQueryInfo;
 import com.ym.mec.biz.service.StudentGoodsSellService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
@@ -30,7 +31,7 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
 	}
 
 	@Override
-	public PageInfo<StudentGoodsSellDto> queryStudentGoodsOrders(QueryInfo queryInfo) {
+	public PageInfo<StudentGoodsSellDto> queryStudentGoodsOrders(GoodsSellQueryInfo queryInfo) {
 		//根据订单状态和教务老师获取订单列表
 		PageInfo<StudentGoodsSellDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();

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

@@ -125,10 +125,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             dataList = studentRegistrationDao.queryStudentDetailPage(params);
             Set<Integer> subjectIds = dataList.stream().map(e -> e.getActualSubjectId()).collect(Collectors.toSet());
             Map<Integer, String> subjectMap = MapUtil.convertIntegerMap(musicGroupSubjectPlanDao.findSubjectMap(subjectIds, queryInfo.getMusicGroupId()));
+            List<SubjectChange> waitPayChange = subjectChangeDao.getMusicGroupWaitPay(queryInfo.getMusicGroupId());
+            Map<Integer, List<SubjectChange>> studentWaitPayChange = waitPayChange.stream().collect(Collectors.groupingBy(SubjectChange::getStudentId));
             dataList.forEach(e -> {
                 if (StringUtils.isNotBlank(subjectMap.get(e.getActualSubjectId()))) {
                     e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(subjectMap.get(e.getActualSubjectId())));
                 }
+                if (studentWaitPayChange.containsKey(e.getStudentId())) {
+                    e.setSubjectChange(studentWaitPayChange.get(e.getStudentId()).get(0));
+                }
             });
         }
         if (count == 0) {
@@ -708,7 +713,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             if (musicGroup.getFeeType() != null && musicGroup.getFeeType() != MusicGroupPaymentCalender.FeeType.OFFLINE && musicGroupStudentFee.getTemporaryCourseFee().doubleValue() * 100 == 0) {
                 musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getRemainNetworkClassTimes() + 1);
             }
-            if(studentRegistration.getPaymentStatus() == PaymentStatusEnum.YES){
+            if (studentRegistration.getPaymentStatus() == PaymentStatusEnum.YES) {
                 musicGroupStudentFee.setPaymentValidEndDate(musicGroup.getPaymentValidEndDate());
             }
             musicGroupStudentFeeDao.insert(musicGroupStudentFee);

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

@@ -184,4 +184,18 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         subjectChangeDao.insert(subjectChange);
         return subjectChange;
     }
+
+    @Override
+    public SubjectChange cancel(Integer id) {
+        SubjectChange subjectChange = subjectChangeDao.get(id);
+        if (!subjectChange.getStatus().equals(SubjectChangeStatusEnum.WAIT_PAY)) {
+            throw new BizException("不是待支付状态，不能取消");
+        }
+        subjectChange.setStatus(SubjectChangeStatusEnum.CANCELED);
+        subjectChange.setUpdateTime(new Date());
+        if (subjectChangeDao.update(subjectChange) <= 0) {
+            throw new BizException("取消失败,请重试");
+        }
+        return subjectChange;
+    }
 }

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

@@ -79,7 +79,7 @@
 	</select>
     <select id="countStudentGoodsOrders" resultType="java.lang.Integer">
 		SELECT COUNT(spo.id_) FROM student_payment_order spo
-		LEFT JOIN student_goods_sell sgs ON spo.id_ = sgs.order_no_
+		LEFT JOIN student_goods_sell sgs ON spo.order_no_ = sgs.order_no_
 		<include refid="queryStudentGoodsOrdersSql"/>
 	</select>
 	<resultMap type="com.ym.mec.biz.dal.dto.StudentGoodsSellDto" id="StudentGoodsSellDto" extends="com.ym.mec.biz.dal.dao.StudentPaymentOrderDao.StudentPaymentOrder">
@@ -102,7 +102,7 @@
 	</sql>
 	<select id="queryStudentGoodsOrders" resultMap="StudentGoodsSellDto">
 		SELECT spo.*,sgs.goods_json_,sgs.total_amount_,sgs.market_amount_ FROM student_payment_order spo
-		LEFT JOIN student_goods_sell sgs ON spo.id_ = sgs.order_no_
+		LEFT JOIN student_goods_sell sgs ON spo.order_no_ = sgs.order_no_
 		<include refid="queryStudentGoodsOrdersSql"/>
 		ORDER BY spo.create_time_ DESC
 		<include refid="global.limit"/>

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

@@ -160,4 +160,8 @@
         LEFT jOIN sys_user su ON su.id_=sc.student_id_
         WHERE sc.id_ = #{id}
     </select>
+
+    <select id="getMusicGroupWaitPay" resultMap="SubjectChange">
+        SELECT * FROM subject_change WHERE music_group_id_ = #{musicGroupId} AND status_ = 0
+    </select>
 </mapper>

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

@@ -141,4 +141,10 @@ public class RepairController extends BaseController {
         queryInfo.setStudentId(sysUser.getId());
         return succeed(studentGoodsSellService.queryStudentGoodsOrders(queryInfo));
     }
+
+    @ApiOperation(value = "获取学员商品订单")
+    @GetMapping("/getStudentGoodsOrder")
+    public Object getStudentGoodsOrder(Integer goodsSellId) {
+        return succeed(studentGoodsSellService.get(goodsSellId));
+    }
 }

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

@@ -59,7 +59,14 @@ public class SubjectChangeController extends BaseController {
     @ApiOperation(value = "添加乐器更换")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('subjectChange/add')")
-    public Object add(SubjectChange subjectChange) throws Exception {
+    public HttpResponseResult<SubjectChange> add(SubjectChange subjectChange) throws Exception {
         return succeed(subjectChangeService.addChange(subjectChange));
     }
+
+    @ApiOperation(value = "取消乐器更换")
+    @PostMapping("/cancel")
+    @PreAuthorize("@pcs.hasPermissions('subjectChange/cancel')")
+    public HttpResponseResult<SubjectChange> cancel(Integer id) throws Exception {
+        return succeed(subjectChangeService.cancel(id));
+    }
 }