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

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/TenantInfo.java

@@ -30,13 +30,23 @@ public class TenantInfo {
 	
 	/** 数据源 */
 	private String dataSource;
+
+	private Integer userId;
 	
 	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysRoleDao.java

@@ -28,4 +28,13 @@ public interface SysRoleDao extends BaseDAO<Integer, SysRole> {
      * @return
      */
     SysRole findByRoleName(@Param("roleName") String roleName, @Param("tenantId") Integer tenantId);
+
+    /**
+    * @description: 获取机构管理员角色
+     * @param tenantId
+    * @return java.lang.Integer
+    * @author zx
+    * @date 2022/1/10 14:35
+    */
+    Integer getMinRoleId(@Param("tenantId") Integer tenantId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysRoleServiceImpl.java

@@ -7,6 +7,7 @@ import com.ym.mec.auth.service.SysRoleService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +41,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void addRole(SysRole sysRole) {
-		SysRole findByName = sysRoleDao.findByRoleName(sysRole.getRoleName(), sysRole.getTenantId());
+		SysRole findByName = sysRoleDao.findByRoleName(sysRole.getRoleName(),sysRole.getTenantId());
 		if(findByName != null){
 			throw new BizException("操作失败：角色 {} 已存在",sysRole.getRoleName());
 		}
@@ -48,10 +49,19 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 		batchSave(sysRole);
 	}
 
+	public void checkManageRole(Integer id){
+		Integer tenantId = TenantContextHolder.getTenantId();
+		Integer roleId = sysRoleDao.getMinRoleId(tenantId);
+		if(roleId.equals(id)){
+			throw new BizException("操作失败：机构管理员角色不允许调整");
+		}
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateRole(SysRole sysRole) {
-		SysRole findByName = sysRoleDao.findByRoleName(sysRole.getRoleName(), sysRole.getTenantId());
+		this.checkManageRole(sysRole.getId());
+		SysRole findByName = sysRoleDao.findByRoleName(sysRole.getRoleName(),sysRole.getTenantId());
 		if(findByName != null && !findByName.getId().equals(sysRole.getId())){
 			throw new BizException("操作失败：角色 {} 已存在",sysRole.getRoleName());
 		}
@@ -64,6 +74,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void delRole(Integer id) {
+		this.checkManageRole(id);
 		sysRoleDao.delete(id);
 		sysRoleMenuDao.deleteAllMenu(id);
 	}
@@ -78,12 +89,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	private void batchSave(SysRole sysRole){
 		List<Integer> menuIds = sysRole.getMenuIds();
 		if(menuIds != null && menuIds.size() > 0){
-//			SysRoleMenu sysRoleMenu = new SysRoleMenu(sysRole.getId(),null);
 			sysRoleMenuDao.batchAdd(sysRole.getId(),menuIds, sysRole.getTenantId());
-//			menuIds.forEach(e->{
-//				sysRoleMenu.setMenuId(e);
-//				sysRoleMenuDao.insert(sysRoleMenu);
-//			});
 		}
 	}
 

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -87,4 +87,7 @@
     <select id="findByRoleName" resultMap="SysRole">
         SELECT * FROM sys_role WHERE role_name_ = #{roleName} AND del_flag_ = 0 and tenant_id_ = #{tenantId} LIMIT 1
     </select>
+    <select id="getMinRoleId" resultType="java.lang.Integer">
+        SELECT sr.id_ FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId} LIMIT 1
+    </select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -12,6 +12,7 @@
 		<result column="contact_name_" property="contactName" />
 		<result column="contact_phone_" property="contactPhone" />
 		<result column="data_source_" property="dataSource" />
+		<result column="user_id_" property="userId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -32,8 +33,8 @@
 	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.TenantInfo"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO tenant_info
-		(id_,name_,address_,domain_name_,logo_url_,contact_name_,contact_phone_,data_source_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{address},#{domainName},#{logoUrl},#{contactName},#{contactPhone},#{dataSource},#{createTime},#{updateTime})
+		(name_,address_,domain_name_,logo_url_,contact_name_,contact_phone_,data_source_,create_time_,update_time_)
+		VALUES(#{name},#{address},#{domainName},#{logoUrl},#{contactName},#{contactPhone},#{dataSource},#{createTime},#{updateTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->

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

@@ -29,10 +29,9 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
 
     /**
      *
-     * @param userId
      * @return
      */
-    List<Organization> queryEmployeeOrgan(@Param("userId") Integer userId, @Param("organId") String organId);
+    List<Organization> queryEmployeeOrgan(@Param("organId") String organId);
 
     /**
      * 根据分部编号获取分部名称map

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

@@ -13,6 +13,8 @@ public class PracticeGroupSellPrice extends BaseEntity {
 
     private Integer organId;
 
+    private String organName;
+
     private BigDecimal onceOriginalPrice;
 
     private BigDecimal onceActivityPrice;
@@ -51,6 +53,14 @@ public class PracticeGroupSellPrice extends BaseEntity {
 
     private Date updateTime;
 
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
     public BigDecimal getSingleClassMinutesPrice() {
         return singleClassMinutesPrice;
     }

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

@@ -12,10 +12,10 @@ public interface OrganizationService extends BaseService<Integer, Organization>
     Set<Integer>  EXCLUDE_ORGAN_IDS = new HashSet<>(Arrays.asList(36,38,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56,2,27,22,24));
 
     /**
-     * 获取员工坐在分部列表
+     * 获取员工所在分部列表
      * @return
      */
-    List<Organization> queryEmployeeOrgan(Integer userId,String organId) throws Exception;
+    List<Organization> queryEmployeeOrgan() throws Exception;
 
     /**
      * 获取员工坐在分部列表

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.PracticeGroupSellPrice;
+import com.ym.mec.common.service.BaseService;
+
+public interface PracticeGroupSellPriceService extends BaseService<Integer, PracticeGroupSellPrice> {
+
+}

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

@@ -110,7 +110,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		//新增用户职位
 		employeePositionService.batchAddPosition(employee.getId(),employee.getPositionIds(), tenantId);
 		//添加用户现金账户
-		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(),"CNY"));
+		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(), tenantId,"CNY"));
 		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),null));
 		employee.setImToken(imResult.getToken());
 		teacherDao.updateUser(employee);
@@ -165,7 +165,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employee.setAvatar(sysUser.getAvatar());
         //更新机构信息
         TenantInfo tenantInfo = tenantInfoService.getOne(new WrapperUtil<TenantInfo>()
-                .hasEq("user_id_",employee.getId()).queryWrapper());
+                .queryWrapper().eq("user_id_",employee.getId()));
         if(Objects.nonNull(tenantInfo) && !Objects.equals(tenantInfo.getPhone(),employee.getPhone())){
             tenantInfo.setPhone(employee.getPhone());
             tenantInfo.setUpdatedTime(new Date());

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

@@ -315,23 +315,8 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		
 		List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentCalenderCourseSettingsDao.getWithPaymentCalender(musicGroupPaymentCalenderId);
 
-		//总金额 = 会员费用 + 课程费用
-//		BigDecimal expectAmount = BigDecimal.ZERO;
-//		BigDecimal expectMemberAmount = musicGroupPaymentCalender.getMemberPaymentAmount();
-//		if (musicGroupPaymentCalender.getPayUserType() == STUDENT) {
-//			if (musicGroupPaymentCalender.getPayUserType() == STUDENT) {
-//				for (MusicGroupPaymentCalenderCourseSettings courseSettings : courseSettingsList) {
-//					 剔除可选课程
-//					if (courseSettings.getIsStudentOptional() == false) {
-//						expectAmount = expectAmount.add(courseSettings.getCourseCurrentPrice());
-//					}
-//				}
-//			}
-//		}
-
 		Date date = new Date();
 		MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = null;
-		Map<Integer,MusicGroupPaymentCalenderDetail> userMap = new HashMap<Integer, MusicGroupPaymentCalenderDetail>();
 		List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList = new ArrayList<MusicGroupPaymentCalenderDetail>();
 		//创建缴费明细
 		for(Integer studentId : userIdList){
@@ -352,10 +337,11 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			musicGroupPaymentCalenderDetailList.add(musicGroupPaymentCalenderDetail);
 		}
 
+		Map<Integer,Long> userMap = new HashMap<>();
 		if (musicGroupPaymentCalenderDetailList.size() > 0) {
 			musicGroupPaymentCalenderDetailDao.batchInsert(musicGroupPaymentCalenderDetailList);
 			for(MusicGroupPaymentCalenderDetail cd : musicGroupPaymentCalenderDetailList){
-				userMap.put(cd.getUserId(), cd);
+				userMap.put(cd.getUserId(), cd.getId());
 			}
 		}
 		//更新预计缴费人数
@@ -379,7 +365,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 					musicGroupPaymentStudentCourseDetail.setCourseType(courseSettings.getCourseType());
 					musicGroupPaymentStudentCourseDetail.setCreateTime(date);
 					musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalenderId);
-					musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(userMap.get(studentId).getId());
+					musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(userMap.get(studentId));
 					musicGroupPaymentStudentCourseDetail.setTotalCourseMinutes(courseSettings.getCourseTotalMinuties());
 					musicGroupPaymentStudentCourseDetail.setCourseOriginalPrice(courseSettings.getCourseOriginalPrice());
 					musicGroupPaymentStudentCourseDetail.setCourseCurrentPrice(courseSettings.getCourseCurrentPrice());
@@ -545,7 +531,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 
 		if (musicGroupPaymentCalenderDetailList.size() > 0) {
 			musicGroupPaymentCalenderDetailDao.batchInsert(musicGroupPaymentCalenderDetailList);
-			musicGroupPaymentCalenderDetailList.stream().map(e-> userMap.put(e.getUserId(),e.getId()));
+			musicGroupPaymentCalenderDetailList.stream().forEach(e-> userMap.put(e.getUserId(),e.getId()));
 		}
 		//更新预计缴费人数
 		musicGroupPaymentCalender.setExpectNum(musicGroupPaymentCalender.getExpectNum() + userIdList.size());

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

@@ -13,7 +13,6 @@ import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
@@ -23,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -50,6 +50,20 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     @Autowired
     private CloudTeacherOrderService cloudTeacherOrderService;
 
+    //支付类型
+    private static final Map<String, Function<PaymentParam, Map<String, Object>>> checkOrderType = new HashMap<>();
+
+    {
+        //开通缴费/续费
+        checkOrderType.put("tenant", this::openOrRenew);
+        //云教练支付
+        checkOrderType.put("cloudTeacherOrder", this::cloudTeacherOrder);
+        //机构充值
+        checkOrderType.put("tenantRecharge", this::tenantRecharge);
+        //teacher
+        checkOrderType.put("teacher", this::teacher);
+    }
+
     @Override
     public Map<String, Object> executePayment(BigDecimal amount, String orderNo, String payChannel, String returnUrl, String orderSubject, String orderBody, String sign, String code, String platform) throws Exception {
         PaymentParam payParam = new PaymentParam(amount, orderNo, payChannel, returnUrl,
@@ -63,63 +77,10 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 
         Map<String, Object> payment = new HashMap<>();
         if (platform != null) {
-            if (WrapperUtil.checkStr(platform,"tenant")) {
-                //机构开通、续费付款
-                TenantOrderRecord tenantOrderRecord = tenantOrderRecordService.getOne(new WrapperUtil<TenantOrderRecord>()
-                        .hasEq("order_no_", payParam.getOrderNo()).queryWrapper());
-                payment = checkOrderAndGetParam(payParam,
-                        tenantOrderRecord,
-                        TenantOrderRecord::getEnumOrderState,
-                        TenantOrderRecord::getCreatedTime,
-                        tenantOrderRecord::setTransNo,
-                        tenantOrderRecordService::updateById
-                );
-                //机构开通付款 主动延迟检查订单
-                delayCheckTenant();
-            } else if (platform.equals("cloudTeacherOrder")) {
-                // 云教练支付
-                TenantOrderRecord tenantOrderRecord = tenantOrderRecordService.getOne(new WrapperUtil<TenantOrderRecord>()
-                                                                                              .hasEq("order_no_", payParam.getOrderNo()).queryWrapper());
-                if (tenantOrderRecord.getOrderState() == 1) {
-                    throw new Exception("订单已支付, 订单号:" + payParam.getOrderNo());
-                }
-                payment = checkOrderAndGetParam(payParam,
-                                                tenantOrderRecord,
-                                                TenantOrderRecord::getEnumOrderState,
-                                                TenantOrderRecord::getCreatedTime,
-                                                tenantOrderRecord::setTransNo,
-                                                tenantOrderRecordService::updateById
-                );
-                // 云教练支付 主动延迟检查订单
-                log.info("executePayment delayCheckCloudTeacherOrder >>>>> ");
-                delayCheckCloudTeacherOrder(tenantOrderRecord);
-            } else if (platform.equals("tenantRecharge")) {
-                // 机构充值
-                TenantOrderRecord tenantOrderRecord = tenantOrderRecordService.getOne(new WrapperUtil<TenantOrderRecord>()
-                                                                                              .hasEq("order_no_", payParam.getOrderNo()).queryWrapper());
-                if (tenantOrderRecord.getOrderState() == 1) {
-                    throw new Exception("订单已支付, 订单号:" + payParam.getOrderNo());
-                }
-                payment = checkOrderAndGetParam(payParam,
-                                                tenantOrderRecord,
-                                                TenantOrderRecord::getEnumOrderState,
-                                                TenantOrderRecord::getCreatedTime,
-                                                tenantOrderRecord::setTransNo,
-                                                tenantOrderRecordService::updateById
-                );
-                //主动延迟检查订单
-                log.info("executePayment delayCheckTenantRecharge >>>>> ");
-                delayCheckTenantRecharge(tenantOrderRecord);
-            } else if (platform.equals("teacher")) {
-                TenantPaymentOrder tenantPaymentOrder = tenantPaymentOrderService.queryByOrderNo(payParam.getOrderNo());
-                payment = checkOrderAndGetParam(payParam,
-                        tenantPaymentOrder,
-                        TenantPaymentOrder::getStatus,
-                        TenantPaymentOrder::getCreateTime,
-                        tenantPaymentOrder::setTransNo,
-                        tenantPaymentOrderService::update
-                );
-            } else {
+            //根据传入platform 来判断执行哪个操作
+            Function<PaymentParam, Map<String, Object>> function = checkOrderType.get(platform);
+            //如果以上操作都没有 则应该是这一个，因为老代码就是这样写的。
+            if (Objects.isNull(function)) {
                 StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findOrderByOrderNo(payParam.getOrderNo());
                 payment = checkOrderAndGetParam(payParam,
                         studentPaymentOrder,
@@ -128,16 +89,88 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
                         studentPaymentOrder::setTransNo,
                         studentPaymentOrderService::update
                 );
+            } else {
+                payment = function.apply(payParam);
             }
         }
+        return payment;
+    }
+
+    //teacher
+    private Map<String, Object> teacher(PaymentParam payParam) {
+        Map<String, Object> payment;
+        TenantPaymentOrder tenantPaymentOrder = tenantPaymentOrderService.queryByOrderNo(payParam.getOrderNo());
+        try {
+            payment = checkOrderAndGetParam(payParam,
+                    tenantPaymentOrder,
+                    TenantPaymentOrder::getStatus,
+                    TenantPaymentOrder::getCreateTime,
+                    tenantPaymentOrder::setTransNo,
+                    tenantPaymentOrderService::update
+            );
+        } catch (Exception e) {
+            throw new BizException(e.getMessage());
+        }
+        return payment;
+    }
+
+    // 机构充值
+    private Map<String, Object> tenantRecharge(PaymentParam payParam) {
+        Map<String, Object> payment;
+        TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
+        payment = checkOrderGetPayment(payParam, tenantOrderRecord);
+        //主动延迟检查订单
+        log.info("executePayment delayCheckTenantRecharge >>>>> ");
+        delayCheckTenantRecharge(tenantOrderRecord);
+        return payment;
+    }
+
+    // 云教练支付
+    private Map<String, Object> cloudTeacherOrder(PaymentParam payParam) {
+        TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
+        Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
+        // 云教练支付 主动延迟检查订单
+        log.info("executePayment delayCheckCloudTeacherOrder >>>>> ");
+        delayCheckCloudTeacherOrder(tenantOrderRecord);
+        return payment;
+    }
+
+    //机构开通、续费付款
+    private Map<String, Object> openOrRenew(PaymentParam payParam) {
+        TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
+        Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
+        //主动延迟检查订单
+        delayCheckTenant();
+        return payment;
+    }
+
+    //查询订单
+    private TenantOrderRecord getTenantOrderRecord(String orderNo) {
+        return tenantOrderRecordService.getOne(new WrapperUtil<TenantOrderRecord>()
+                .hasEq("order_no_", orderNo).queryWrapper());
+    }
 
+    //获取支付数据
+    private Map<String, Object> checkOrderGetPayment(PaymentParam payParam, TenantOrderRecord tenantOrderRecord) {
+        Map<String, Object> payment;
+        try {
+            payment = checkOrderAndGetParam(payParam,
+                    tenantOrderRecord,
+                    TenantOrderRecord::getEnumOrderState,
+                    TenantOrderRecord::getCreatedTime,
+                    tenantOrderRecord::setTransNo,
+                    tenantOrderRecordService::updateById
+            );
+        } catch (Exception e) {
+            throw new BizException(e.getMessage());
+        }
         return payment;
     }
 
     private void checkSing(PaymentParam param) {
         Map<String, Object> signParams = new LinkedHashMap<>();
         signParams.put("appId", ConfigInit.appId);
-        signParams.put("amount", param.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP));
+        signParams.put("amount", param.getAmount().setScale(2, RoundingMode.HALF_UP));
         signParams.put("orderNo", param.getOrderNo());
         signParams.put("orderSubject", param.getOrderSubject());
         signParams.put("orderBody", param.getOrderBody());
@@ -156,7 +189,9 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         if (Objects.isNull(clazz)) {
             throw new BizException("订单不存在");
         }
+        //校验订单状态
         checkOrderState(clazz, enumFunc);
+        //获取订单创建时间
         Date createTime = dateFunc.apply(clazz);
         //校验订单是否超时
         String timeExpire = checkOrderTimeOut(createTime);
@@ -164,7 +199,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         Map<String, Object> paymentParams = getPaymentParam(payParam);
         paymentParams.put("time_expire", timeExpire);
         paymentParams.put("expend", getExpend(payParam));
-        //获取第三方的支付的信息
+        //向第三方发起支付，获取第三方的支付的信息
         Map<String, Object> payment = Payment.executePayment(paymentParams);
         log.info("executePayment create order param >>>>> {}", JSON.toJSONString(payment));
         String transNo = (String) payment.get("id");
@@ -195,15 +230,8 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     }
 
     private <T> void setTransNoByApply(String TransNo, T clazz, Consumer<String> setOption, Consumer<T> action) {
-        Optional.ofNullable(clazz)
-                .filter(c -> Objects.nonNull(setOption))
-                .filter(c -> Objects.nonNull(action))
-                .filter(c -> StringUtils.isNotBlank(TransNo))
-                .map(c -> {
-                    setOption.accept(TransNo);
-                    return c;
-                })
-                .ifPresent(action);
+        setOption.accept(TransNo);
+        action.accept(clazz);
     }
 
     private Map<String, Object> getExpend(PaymentParam payParam) throws Exception {
@@ -260,6 +288,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
                     tenantOrderRecordService.checkTenantOrder();
                     log.info("delayCheckTenant >>>>>  start {}", i);
                 } catch (InterruptedException e) {
+                    log.error("delayCheckTenant >>>>", e.getCause());
                     return;
                 }
             }
@@ -284,7 +313,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
                     Thread.sleep(3000);//每3秒触发一次
                     log.info("云教练 支付 重试>>>>>  start {}", i);
                 } catch (Exception e) {
-                    log.info("云教练 支付 异常  ", e.toString());
+                    log.info("云教练 支付 异常 : {}", e.toString());
                     e.printStackTrace();
                 }
             }

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

@@ -55,21 +55,18 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	}
 
 	@Override
-	public List<Organization> queryEmployeeOrgan(Integer userId,String organId){
-		return organizationDao.queryEmployeeOrgan(userId,organId);
-	}
-
-	@Override
-	public List<Organization> queryEmployeeOrganByUser(){
+	public List<Organization> queryEmployeeOrgan(){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if(sysUser == null){
 			throw new BizException("获取用户信息失败");
 		}
-		Integer userId = sysUser.getId();
-		if(sysUser.getIsSuperAdmin()){
-			userId = null;
-		}
-		return organizationDao.queryEmployeeOrgan(userId,null);
+		String organIds = this.getEmployeeOrgan(sysUser.getId(), "", sysUser.getIsSuperAdmin());
+		return organizationDao.queryEmployeeOrgan(organIds);
+	}
+
+	@Override
+	public List<Organization> queryEmployeeOrganByUser(){
+		return this.queryEmployeeOrgan();
 	}
 
 	@Override
@@ -219,13 +216,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 
     @Override
     public <T extends EducationBaseQueryInfo> T onlyEducation(T queryInfo) {
-		if(StringUtils.isEmpty(queryInfo.getOrganIds())){
-			throw new BizException("请选择分部");
-		}
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			throw new BizException("用户信息获取失败");
 		}
+		queryInfo.setOrganIds(this.getEmployeeOrgan(sysUser.getId(),queryInfo.getOrganIds(),sysUser.getIsSuperAdmin()));
 		Boolean onlyForRole = employeePositionService.onlyForRole(EDUCATION, sysUser.getId(), sysUser.getIsSuperAdmin());
 		//如果当前用户只有教务老师角色，那么只能看到他所管理的课程组的信息
 		if (onlyForRole) {

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.PracticeGroupSellPriceDao;
+import com.ym.mec.biz.dal.entity.PracticeGroupSellPrice;
+import com.ym.mec.biz.service.PracticeGroupSellPriceService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class PracticeGroupSellPriceServiceImpl extends BaseServiceImpl<Integer, PracticeGroupSellPrice> implements PracticeGroupSellPriceService {
+	
+	@Autowired
+	private PracticeGroupSellPriceDao practiceGroupSellPriceDao;
+
+	@Override
+	public BaseDAO<Integer, PracticeGroupSellPrice> getDAO() {
+		return practiceGroupSellPriceDao;
+	}
+
+}

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

@@ -338,14 +338,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 vscps.add(new VipGroupStudentCoursePrice(canBuyStudentId, vipGroupApplyBaseInfoDto.getOnlineClassesUnitPrice(), vipGroupApplyBaseInfoDto.getOfflineClassesUnitPrice(), vipGroupApplyBaseInfoDto.getTotalPrice()));
             }
         }
-//        Teacher teacher = teacherService.get(vipGroupApplyBaseInfoDto.getUserId());
-//		if(Objects.isNull(teacher)){
-//		    throw new BizException("教师不存在");
-//        }
-//		if(Objects.isNull(teacher.getTeacherOrganId())){
-//		    throw new BizException("教师部门异常");
-//        }
-//        vipGroupApplyBaseInfoDto.setOrganId(Integer.parseInt(teacher.getOrganId()));
         //开课时间为排课的第一节课的开始时间
         vipGroupApplyBaseInfoDto.setCourseStartDate(firstCourseSchedule.getStartClassTime());
         //课程结束时间为排课的最后一节课的结束时间

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

@@ -447,8 +447,8 @@
 			</if>
 			AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
 			AND (mgpcd.expect_amount_ + mgpcd.expect_member_amount_) > 0
-			<if test="organIds != null and organIds.size() != ''">
-				AND mg.organ_id_ IN FIND_IN_SET(mg.organ_id_,#{organIds})
+			<if test="organIds != null and organIds != ''">
+				AND FIND_IN_SET(mg.organ_id_,#{organIds})
 			</if>
 			<if test="musicGroupId!=null and musicGroupId!=''">
 				AND mgpc.music_group_id_ = #{musicGroupId}

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

@@ -150,7 +150,7 @@
     <delete id="deleteByMusicGroupPaymentCalenderDetailId">
         DELETE FROM music_group_payment_student_course_detail
         <where>
-        	music_group_payment_calender_detail_id_ in    
+        	music_group_payment_calender_detail_id_ IN
 		    <foreach item="item" collection="list" separator="," open="(" close=")" index="">    
 		      #{item}    
 		    </foreach>

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

@@ -139,7 +139,6 @@
         SELECT * FROM organization o
         <where>
             o.del_flag_ = 0
-                AND FIND_IN_SET(o.id_,(SELECT GROUP_CONCAT(organ_id_list_) FROM employee e WHERE e.user_id_ = #{userId}))
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(o.id_,#{organId})
             </if>

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

@@ -22,6 +22,7 @@
 		<result column="care_package_price" property="carePackagePrice" />
 		<result column="come_on_package_price" property="comeOnPackagePrice" />
 		<result column="single_class_minutes_price_" property="singleClassMinutesPrice" />
+		<result column="organ_name_" property="organName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
         <result column="tenant_id_" property="tenantId"/>
@@ -80,7 +81,9 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="PracticeGroupSellPrice" parameterType="map">
-		SELECT * FROM practice_group_sell_price where tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT pgsp.*,o.name_ organ_name_ FROM practice_group_sell_price pgsp
+		LEFT JOIN organization o ON o.id_ = pgsp.organ_id_
+		WHERE pgsp.tenant_id_ = #{tenantId} ORDER BY pgsp.organ_id_
 		<include refid="global.limit" />
 	</select>
 

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

@@ -1,7 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ActivityPlanAddDto;
 import com.ym.mec.biz.dal.entity.ActivityPlan;
 import com.ym.mec.biz.dal.page.ActivityPlanQueryInfo;
@@ -24,8 +22,6 @@ public class ActivityPlanController extends BaseController {
 
     @Autowired
     private ActivityPlanService activityPlanService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private OrganizationService organizationService;
 

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

@@ -11,10 +11,13 @@ import com.ym.mec.biz.service.IndexBaseMonthDataService;
 import com.ym.mec.biz.service.OrganizationService;
 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.PageInfo;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
@@ -25,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Api(tags = "首页")
@@ -51,6 +55,8 @@ public class IndexController extends BaseController {
 	private StudentPaymentOrderDao studentPaymentOrderDao;
 	@Autowired
 	private IndexBaseMonthDataService indexService;
+	@Autowired
+	private RedissonClient redissonClient;
 
 	@ApiOperation(value = "获取首页数据")
 	@GetMapping("/index")
@@ -106,7 +112,18 @@ public class IndexController extends BaseController {
 
 	@GetMapping("/hasIndexErrData")
 	public HttpResponseResult hasIndexErrData(String organId){
-		return succeed(indexService.hasIndexErrData(organizationService.getEmployeeOrgan(organId)));
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			throw new BizException("用户信息获取失败");
+		}
+		RBucket<Map<String, Boolean>> bucket = redissonClient.getBucket(sysUser.getId() + ":hasIndexErrData");
+		Map<String, Boolean> map = bucket.get();
+		if(map == null || map.size() == 0){
+			organId = organizationService.getEmployeeOrgan(sysUser.getId(),organId,sysUser.getIsSuperAdmin());
+			map = indexService.hasIndexErrData(organId);
+			bucket.set(map,10, TimeUnit.MINUTES);
+		}
+		return succeed(map);
 	}
 
 	@GetMapping("/getIndexErrData")

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

@@ -1,7 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.MusicArrearageStudentDto;
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAddStudentDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
@@ -30,10 +28,6 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
 
     @Autowired
     private MusicGroupPaymentCalenderDetailService musicGroupPaymentCalenderDetailService;
-
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-
     @Autowired
     private OrganizationService organizationService;
 

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

@@ -48,12 +48,7 @@ public class OrganizationController extends BaseController {
     @GetMapping("/queryEmployeeOrgan")
     @PreAuthorize("@pcs.hasPermissions('organization/queryEmployeeOrgan')")
     public Object queryEmployeeOrgan() throws Exception {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(sysUser == null){
-			throw new BizException("获取用户信息失败");
-		}
-		Integer userId = sysUser.getId();
-        return succeed(organizationService.queryEmployeeOrgan(userId,null));
+        return succeed(organizationService.queryEmployeeOrgan());
     }
 
     @ApiOperation(value = "获取员工所在分部列表（管理员查看所有的分部）")

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

@@ -0,0 +1,69 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.biz.dal.entity.PracticeGroupSellPrice;
+import com.ym.mec.biz.service.PracticeGroupSellPriceService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+
+@RequestMapping("practiceGroupSellPrice")
+@Api(tags = "网管课价格配置")
+@RestController
+public class PracticeGroupSellPriceController extends BaseController {
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private PracticeGroupSellPriceService practiceGroupSellPriceService;
+
+	@ApiOperation("分页查询")
+	@GetMapping(value = "/list")
+	@PreAuthorize("@pcs.hasPermissions('practiceGroupSellPrice/list')")
+	public Object getList(QueryInfo queryInfo) {
+		return succeed(practiceGroupSellPriceService.queryPage(queryInfo));
+	}
+
+	@ApiOperation("单查询")
+	@ApiImplicitParam(name = "organId", value = "分部编号", required = true, dataType = "Integer", paramType = "path")
+	@GetMapping(value = "/query")
+	@PreAuthorize("@pcs.hasPermissions('practiceGroupSellPrice/query')")
+	public Object query(Integer organId) {
+		return succeed(practiceGroupSellPriceService.get(organId));
+	}
+
+	@ApiOperation("新增")
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PreAuthorize("@pcs.hasPermissions('practiceGroupSellPrice/add')")
+	public Object add(PracticeGroupSellPrice practiceGroupSellPrice) {
+
+		Date date = new Date();
+		practiceGroupSellPrice.setCreateTime(date);
+		practiceGroupSellPrice.setUpdateTime(date);
+		practiceGroupSellPriceService.insert(practiceGroupSellPrice);
+		return succeed();
+	}
+
+	@ApiOperation("更新")
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PreAuthorize("@pcs.hasPermissions('practiceGroupSellPrice/update')")
+	public Object update(PracticeGroupSellPrice practiceGroupSellPrice) {
+		practiceGroupSellPrice.setUpdateTime(new Date());
+		practiceGroupSellPriceService.update(practiceGroupSellPrice);
+		return succeed();
+	}
+}

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

@@ -373,15 +373,11 @@ public class StudentManageController extends BaseController {
     @GetMapping("/getCloudStudyStudentOverView")
     @PreAuthorize("@pcs.hasPermissions('studentManage/getCloudStudyStudentOverView')")
     public HttpResponseResult<CloudStudyStudentDataDto> getCloudStudyStudentOverView(String organIds) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        List<Integer> organIdsList = new ArrayList<>();
+        List<Integer> organIdsList;
         if(StringUtils.isNotBlank(organIds)){
             organIdsList = Arrays.stream(organIds.split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toList());
         }else{
-            List<Organization> organizations = organizationService.queryEmployeeOrgan(sysUser.getId(),null);
+            List<Organization> organizations = organizationService.queryEmployeeOrgan();
             if(CollectionUtils.isEmpty(organizations)){
                 return succeed();
             }

mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -13,10 +13,8 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.date.DateUtil;
-
 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.util.CollectionUtils;
@@ -244,7 +242,7 @@ public class ActivityController extends BaseController {
     @ApiOperation(value = "云教练活动统计")
     @GetMapping("/countCloudTeacherActive")
     public Object countCloudTeacherActive(CloudTeacherActiveQueryInfo queryInfo) throws Exception {
-        List<Organization> organizations = organizationService.queryEmployeeOrgan(null,null);
+        List<Organization> organizations = organizationService.queryEmployeeOrgan();
         List<Integer> organIds = new ArrayList<>();
         if(StringUtils.isNotBlank(queryInfo.getOrganIds())){
             organIds = Arrays.stream(queryInfo.getOrganIds().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toList());

mec-web/src/main/java/com/ym/mec/web/controller/education/EduOrganizationController.java

@@ -1,23 +1,18 @@
 package com.ym.mec.web.controller.education;
 
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
+import com.ym.mec.biz.service.CooperationOrganService;
+import com.ym.mec.biz.service.OrganizationService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.CooperationOrgan;
-import com.ym.mec.biz.service.CooperationOrganService;
-import com.ym.mec.biz.service.OrganizationService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
+import java.util.List;
 
 @RequestMapping("eduOrganization")
 @Api(tags = "分部服务")
@@ -28,24 +23,17 @@ public class EduOrganizationController extends BaseController {
     private OrganizationService organizationService;
     @Autowired
     private CooperationOrganService cooperationOrganService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "获取员工所在分部列表")
     @GetMapping("/queryAllOrgan")
-    public Object queryAllOrgan(String organId) throws Exception {
-        return succeed(organizationService.queryEmployeeOrgan(null,organId));
+    public Object queryAllOrgan() throws Exception {
+        return succeed(organizationService.queryEmployeeOrgan());
     }
 
     @ApiOperation(value = "获取员工所在分部列表")
     @GetMapping("/queryEmployeeOrgan")
     public Object queryEmployeeOrgan() throws Exception {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(sysUser == null){
-			throw new BizException("获取用户信息失败");
-		}
-		Integer userId = sysUser.getId();
-        return succeed(organizationService.queryEmployeeOrgan(userId,null));
+        return succeed(organizationService.queryEmployeeOrgan());
     }
 
     @ApiOperation(value = "根据分部id获取合作单位(学校)列表")

mec-web/src/main/java/com/ym/mec/web/controller/education/EduStudentController.java

@@ -1,7 +1,5 @@
 package com.ym.mec.web.controller.education;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.EduOrganStudentDataDto;
 import com.ym.mec.biz.dal.dto.StatDto;
 import com.ym.mec.biz.dal.entity.Organization;
@@ -10,11 +8,8 @@ import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.StudentService;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,8 +33,6 @@ public class EduStudentController extends BaseController {
     private StudentService studentService;
     @Autowired
     private OrganizationService organizationService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "云教练学员数据")
     @GetMapping("/organStudentData")
@@ -50,12 +43,7 @@ public class EduStudentController extends BaseController {
     @ApiOperation(value = "分部云教练学员数据预览")
     @GetMapping("/organStudentOverView")
     public HttpResponseResult<List<EduOrganStudentDataDto>> organStudentOverView() throws Exception {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(sysUser == null){
-			throw new BizException("获取用户信息失败");
-		}
-		Integer userId = sysUser.getId();
-        List<Organization> organizations = organizationService.queryEmployeeOrgan(userId,null);
+        List<Organization> organizations = organizationService.queryEmployeeOrgan();
         if(CollectionUtils.isEmpty(organizations)){
             return succeed(Collections.emptyList());
         }