浏览代码

Merge remote-tracking branch 'origin/master'

Joburgess 5 年之前
父节点
当前提交
2ef9896371

+ 5 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPurchaseListDao.java

@@ -2,8 +2,12 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.MusicGroupPurchaseList;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface MusicGroupPurchaseListDao extends BaseDAO<Integer, MusicGroupPurchaseList> {
 
-	
+
+    int batchInsert(@Param("musicGroupPurchaseLists") List<MusicGroupPurchaseList> MusicGroupPurchaseLists);
 }

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -124,6 +124,9 @@ public class MusicGroup {
 
 	@ApiModelProperty(value = "在读人数",required = true)
 	private Integer payNum;
+	
+	@ApiModelProperty(value = "是否是课堂课",required = true)
+	private boolean isClassroomLessons;
 
 	public String getCooperationOrganName() {
 		return cooperationOrganName;
@@ -389,6 +392,14 @@ public class MusicGroup {
 		this.settlementType = settlementType;
 	}
 
+	public boolean isClassroomLessons() {
+		return isClassroomLessons;
+	}
+
+	public void setClassroomLessons(boolean isClassroomLessons) {
+		this.isClassroomLessons = isClassroomLessons;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderDetailService.java

@@ -34,4 +34,11 @@ public interface StudentPaymentOrderDetailService extends BaseService<Long, Stud
      */
     List<Goods> getMusicalList(String musicGroupId);
 
+    /**
+     * 确认采购清单
+     * @param musicGroupId
+     * @return
+     */
+    List<Goods> verifyMusicalList(String musicGroupId);
+
 }

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

@@ -207,6 +207,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void musicGroupAction(String musicGroupId) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){

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

@@ -1,8 +1,11 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.MusicGroupPurchaseListDao;
 import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.entity.MusicGroupPurchaseList;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.service.GoodsService;
+import com.ym.mec.biz.service.MusicGroupPurchaseListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,6 +15,8 @@ import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -21,6 +26,8 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
     @Autowired
     private GoodsService goodsService;
+    @Autowired
+    private MusicGroupPurchaseListDao musicGroupPurchaseListDao;
 
     @Override
     public BaseDAO<Long, StudentPaymentOrderDetail> getDAO() {
@@ -65,4 +72,22 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         }
         return goodies;
     }
+
+    @Override
+    public List<Goods> verifyMusicalList(String musicGroupId) {
+        List<Goods> musicalList = getMusicalList(musicGroupId);
+        Date date = new Date();
+        List<MusicGroupPurchaseList> musicGroupPurchaseLists = new ArrayList<>();
+        for (Goods goods : musicalList) {
+            MusicGroupPurchaseList musicGroupPurchaseList = new MusicGroupPurchaseList();
+            musicGroupPurchaseList.setGoodsId(goods.getId());
+            musicGroupPurchaseList.setMusicGroupId(musicGroupId);
+            musicGroupPurchaseList.setPurchaseNum(goods.getSellCount());
+            musicGroupPurchaseList.setCreateTime(date);
+            musicGroupPurchaseList.setUpdateTime(date);
+            musicGroupPurchaseLists.add(musicGroupPurchaseList);
+        }
+        musicGroupPurchaseListDao.batchInsert(musicGroupPurchaseLists);
+        return  musicalList;
+    }
 }

+ 9 - 0
mec-biz/src/main/resources/config/mybatis/MusicGroupPurchaseListMapper.xml

@@ -83,4 +83,13 @@
             </if>
         </where>
 	</select>
+
+    <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPurchaseList" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_)
+        VALUES
+        <foreach collection="musicGroupPurchaseLists" item="item" index="index" separator=",">
+        (#{item.id},#{item.musicGroupId},#{item.goodsId},#{item.purchaseNum},now(),now())
+        </foreach>
+    </insert>
 </mapper>

+ 8 - 0
mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -41,5 +41,13 @@ public class StudentPaymentOrderController extends BaseController {
         return succeed(studentPaymentOrderDetailService.getMusicalList(musicGroupId));
     }
 
+    @ApiOperation(value = "乐器清单确认")
+    @GetMapping("/verifyMusicalList")
+    @PreAuthorize("@pcs.hasPermissions('order/verifyMusicalList')")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
+    public Object verifyMusicalListMusicalList(String musicGroupId){
+        return succeed(studentPaymentOrderDetailService.verifyMusicalList(musicGroupId));
+    }
+
 
 }

+ 2 - 3
mec-web/src/main/java/com/ym/mec/web/controller/teacher/TeacherDefaultMusicGroupSalaryController.java → mec-web/src/main/java/com/ym/mec/web/controller/TeacherDefaultMusicGroupSalaryController.java

@@ -1,6 +1,5 @@
-package com.ym.mec.web.controller.teacher;
+package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.page.TeacherMusicGroupSalaryQueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -14,9 +13,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary;
+import com.ym.mec.biz.dal.page.TeacherMusicGroupSalaryQueryInfo;
 import com.ym.mec.biz.service.TeacherDefaultMusicGroupSalaryService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 
 @RequestMapping("teacherDefaultMusicGroupSalary")
 @Api(tags = "教师薪酬服务")

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/controller/teacher/TeacherLeaveRecordController.java → mec-web/src/main/java/com/ym/mec/web/controller/TeacherLeaveRecordController.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.controller.teacher;
+package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.dto.TeacherLeaveRecordDto;
 import com.ym.mec.biz.dal.entity.TeacherLeaveRecord;