Merge remote-tracking branch 'origin/master'

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

@@ -97,12 +97,20 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	boolean resumeMusicGroup(String musicGroupId);
 
 	/**
+	 * 延长缴费时间
+	 * @param musicGroupId 乐团编号
+	 * @param expireDate 延长缴费的截止日期
+	 * @return
+	 */
+	boolean extensionPaymentExpireDate(String musicGroupId, Date expireDate);
+
+	/**
 	 * 延长缴费
 	 * @param musicGroupId 乐团编号
 	 * @param expireDate 延长缴费的截止日期
 	 * @return
 	 */
-	boolean extensionPayment(String musicGroupId, Date expireDate);
+	boolean extensionApplyExpireDate(String musicGroupId, Date expireDate);
 
 	/**
 	 * 申请退团

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

@@ -26,6 +26,7 @@ import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -1294,7 +1295,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    public boolean extensionPayment(String musicGroupId, Date expireDate) {
+    public boolean extensionPaymentExpireDate(String musicGroupId, Date expireDate) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
@@ -1305,7 +1306,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         if (musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
-            throw new BizException("乐团当前状态是{}，延长缴费", musicGroup.getStatus().getMsg());
+            throw new BizException("乐团当前状态是{}，不能延长缴费", musicGroup.getStatus().getMsg());
         }
 
         Date date = new Date();
@@ -1315,7 +1316,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         musicGroup.setPaymentExpireDate(expireDate);
-        musicGroup.setApplyExpireDate(expireDate);
         musicGroup.setUpdateTime(date);
         musicGroupDao.update(musicGroup);
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "延长缴费", sysUser.getId(), ""));
@@ -1330,6 +1330,34 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
+	public boolean extensionApplyExpireDate(String musicGroupId, Date expireDate) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        if (musicGroup == null) {
+            throw new BizException("乐团找不到");
+        }
+
+        if (musicGroup.getStatus() != MusicGroupStatusEnum.APPLY && musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
+            throw new BizException("乐团当前状态是{}，不能延长报名", musicGroup.getStatus().getMsg());
+        }
+
+        Date date = new Date();
+
+        if (date.after(expireDate)) {
+            throw new BizException("日期设置错误");
+        }
+
+        musicGroup.setApplyExpireDate(expireDate);
+        musicGroup.setUpdateTime(date);
+        musicGroupDao.update(musicGroup);
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "延长报名时间", sysUser.getId(), ""));
+        return true;
+    }
+
+	@Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public boolean applyQuitMusicGroup(String musicGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();

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

@@ -432,7 +432,7 @@
         GROUP BY spo.organ_id_, co.id_
         ]]></select>
 
-    <!-- 获取分部学校的收入支出(维修、商品销售订单) -->
+    <!-- 获取分部学校的收入支出(声部更改、维修、商品销售订单) -->
     <select id="getRepairGoodsSellGroupMonthReport"
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
@@ -441,20 +441,20 @@
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL')
+          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL','SUBJECT_CHANGE')
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_
         ]]></select>
 
-    <!-- 获取分部学校的收入支出(维修、商品销售订单) -->
+    <!-- 获取分部学校的收入支出(声部更改、维修、商品销售订单) -->
     <select id="getRepairGoodsSellGroupIncome"
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
                SUM(spo.actual_amount_) income_total_
         FROM student_payment_order spo
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL')
+          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL','SUBJECT_CHANGE')
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_

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

@@ -23,6 +23,7 @@
             <result column="discount_price_" property="discountPrice"/>
             <result column="agree_cost_price_" property="agreeCostPrice"/>
             <result column="goods_type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+            <result column="complement_goods_id_list_" property="complementGoodsIdList"/>
         </collection>
     </resultMap>
 
@@ -197,7 +198,8 @@
                g.group_purchase_price_,
                g.discount_price_,
                g.agree_cost_price_,
-               g.type_ goods_type_
+               g.type_ goods_type_,
+               g.complement_goods_id_list_
         FROM student_payment_order_detail spod
                  LEFT JOIN goods g ON FIND_IN_SET(g.id_, spod.goods_id_list_)
         WHERE spod.payment_order_id_ = #{orderId}

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

@@ -17,8 +17,11 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -136,6 +139,12 @@ public class RepairController extends BaseController {
         return succeed(goodsService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "根据商品(教材、辅件)编号查询商品(教材、辅件)")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
+        return succeed(goodsService.get(id));
+    }
+
     @ApiOperation(value = "分页查询商品分类列表")
     @GetMapping("/queryGoodsCategoryPage")
     public Object queryGoodsCategoryPage(GoodsCategoryQueryInfo queryInfo) {

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

@@ -89,7 +89,6 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "根据商品(教材、辅件)编号查询商品(教材、辅件)")
     @GetMapping("/get/{id}")
-    @PreAuthorize("@pcs.hasPermissions('goods/get')")
     public Object get(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
         return succeed(goodsService.get(id));
     }

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

@@ -249,13 +249,23 @@ public class MusicGroupController extends BaseController {
 		return succeed();
 	}
 
-	@ApiOperation(value = "延长缴费")
+	@ApiOperation(value = "延长缴费时间")
 	@PostMapping("/extensionPayment")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/extensionPayment')")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "expireDate", value = "延长缴费的截止日期", required = true, dataType = "Date") })
 	public Object extensionPayment(String musicGroupId, Date expireDate) {
-		musicGroupService.extensionPayment(musicGroupId, expireDate);
+		musicGroupService.extensionPaymentExpireDate(musicGroupId, expireDate);
+		return succeed();
+	}
+
+	@ApiOperation(value = "延长报名时间")
+	@PostMapping("/extensionApplyExpireDate")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/extensionApplyExpireDate')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "expireDate", value = "延长报名的截止日期", required = true, dataType = "Date") })
+	public Object extensionApplyExpireDate(String musicGroupId, Date expireDate) {
+		musicGroupService.extensionApplyExpireDate(musicGroupId, expireDate);
 		return succeed();
 	}