Merge remote-tracking branch 'origin/master'

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

@@ -215,7 +215,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param subjectIds
      * @return
      */
-    List<Teacher> findTeacherByOrganId(@Param("organId")String organId,@Param("subjectIds")String subjectIds);
+    List<Teacher> findTeacherByOrganId(@Param("organId")String organId,@Param("subjectIds")String subjectIds,@Param("jobNature")String jobNature);
 
     /**
      * 获取用户username

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

@@ -1,9 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * 学团注册支付
@@ -20,7 +18,7 @@ public class RegisterPayDto {
     //教谱ids
     private String otherGoodsIds;
     //乐器id->type
-    private Map<Integer,String> goodsGroups;
+    private Map<Long, String> goodsGroups;
 
     //是否余额支付
     private Boolean isUseBalancePayment = false;
@@ -74,11 +72,11 @@ public class RegisterPayDto {
 		this.isUseBalancePayment = isUseBalancePayment;
 	}
 
-    public Map<Integer, String> getGoodsGroups() {
+    public Map<Long, String> getGoodsGroups() {
         return goodsGroups;
     }
 
-    public void setGoodsGroups(Map<Integer, String> goodsGroups) {
+    public void setGoodsGroups(Map<Long, String> goodsGroups) {
         this.goodsGroups = goodsGroups;
     }
 }

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

@@ -135,5 +135,5 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<Teacher> findTeacherByOrganId(String organId,String subjectIds);
+    List<Teacher> findTeacherByOrganId(String organId,String subjectIds,String jobNature);
 }

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

@@ -432,11 +432,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 //团购乐器减免课程费用
                 if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && goodsGroup.getRemissionCourseFee() != null && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.GROUP)) {//团购
                     orderAmount = orderAmount.subtract(goodsGroup.getRemissionCourseFee());
-                    courseFee.subtract(goodsGroup.getRemissionCourseFee());
+                    courseFee = courseFee.subtract(goodsGroup.getRemissionCourseFee());
                 }
             }
         } else if (registerPayDto.getGoodsGroups() != null && registerPayDto.getGoodsGroups().size() > 0) {
-            String goodsGroupIds = registerPayDto.getGoodsGroups().keySet().stream().map(key -> key.toString()).collect(Collectors.joining(","));
+            String goodsGroupIds = registerPayDto.getGoodsGroups().keySet().stream().map(Object::toString).collect(Collectors.joining(","));
             goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(goodsGroupIds);
             for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
                 Map groupType = JSONObject.parseObject(goodsGroup.getKitGroupPurchaseTypeJson(), HashMap.class);
@@ -470,7 +470,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
                 orderAmount = orderAmount.add(goodsGroup.getPrice());
             }
-            orderAmount.subtract(remitFee);
+            orderAmount = orderAmount.subtract(remitFee);
         }
 
         //单独辅件

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

@@ -327,8 +327,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
 	@Override
-	public List<Teacher> findTeacherByOrganId(String organId,String subjectIds) {
-		return teacherDao.findTeacherByOrganId(organId,subjectIds);
+	public List<Teacher> findTeacherByOrganId(String organId,String subjectIds,String jobNature) {
+		return teacherDao.findTeacherByOrganId(organId,subjectIds,jobNature);
 	}
 
 	@Override

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

@@ -596,6 +596,9 @@
         <if test="subjectIds != null">
             AND INTE_ARRAY(t.subject_id_,#{subjectIds})
         </if>
+        <if test="jobNature != null">
+            AND t.job_nature_ = #{jobNature}
+        </if>
     </select>
     <select id="queryUsernameByIds" resultType="java.util.Map" parameterType="list">
         select id_ `key`,username_ `value` FROM sys_user s

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

@@ -21,6 +21,7 @@ import java.util.stream.Stream;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.snaker.engine.entity.Order;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -318,16 +319,17 @@ public class StudentOrderController extends BaseController {
 
         BigDecimal totalMoney = BigDecimal.ZERO;
         Integer totalNum = 0;
-        ArrayList<OrderStatisDto> newOrders = new ArrayList<>();
-        for (OrderStatisDto order : orders) {
+        Iterator<OrderStatisDto> iterator = orders.iterator();
+        while (iterator.hasNext()){
+            OrderStatisDto order = iterator.next();
             if (order.getOrganName().equals("总部国际") || order.getOrganName().equals("阳光总部国际") || order.getOrganName().equals("武汉小学")){
+                iterator.remove();
                 continue;
             }
-            newOrders.add(order);
             totalMoney = totalMoney.add(order.getMoney());
             totalNum += order.getNums();
         }
-        orders = newOrders.stream().sorted(Comparator.comparing(OrderStatisDto::getNums).reversed()).collect(Collectors.toList());
+        orders = orders.stream().sorted(Comparator.comparing(OrderStatisDto::getNums).reversed()).collect(Collectors.toList());
 
         LuckStatisDto luckStatisDto = new LuckStatisDto();
         luckStatisDto.setOrderStatisDtoList(orders);

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

@@ -13,7 +13,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import java.util.Arrays;

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

@@ -119,7 +119,7 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "获取分部教师")
     @GetMapping("/findTeacherByOrganId")
     @PreAuthorize("@pcs.hasPermissions('teacher/findTeacherByOrganId')")
-    public HttpResponseResult findTeacherByOrganId(String organId,String subjectIds) {
+    public HttpResponseResult findTeacherByOrganId(String organId,String subjectIds,String jobNature) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -137,7 +137,7 @@ public class TeacherController extends BaseController {
                 }
             }
         }
-        return succeed(teacherService.findTeacherByOrganId(organId,subjectIds));
+        return succeed(teacherService.findTeacherByOrganId(organId,subjectIds,jobNature));
     }
 
     @ApiOperation(value = "获取乐团所有老师")