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

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

@@ -14,7 +14,7 @@ public interface MemberPrivilegesItemDao extends BaseDAO<Integer, MemberPrivileg
      * @param parentId
      * @return
      */
-    List<MemberPrivilegesItem> findList(@Param("parentId") Integer parentId);
+    List<MemberPrivilegesItem> findList(@Param("parentId") Integer parentId,@Param("tenantId") Integer tenantId);
 
     void batchDel(@Param("collect") List<Integer> collect);
     

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

@@ -81,6 +81,10 @@ public class TenantInfo implements Serializable {
     @ApiModelProperty(value = "状态0 草稿 1启动 2停用")
     private Integer state;
 
+    @TableField("user_id_")
+    @ApiModelProperty(value = "管理员账号id")
+    private Integer userId;
+
     @TableField("created_by_")
     @ApiModelProperty(value = "创建人")
     private Integer createdBy;
@@ -227,6 +231,14 @@ public class TenantInfo implements Serializable {
         this.state = state;
     }
 
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     public Integer getCreatedBy() {
         return createdBy;
     }

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

@@ -19,5 +19,7 @@ public interface TenantOrderRecordService extends IService<TenantOrderRecord> {
 
     Map<String, Object> checkTenantOrder(String orderNo);
 
+    void checkTenantOrder();
+
 }
 

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

@@ -63,6 +63,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             cloudTeacherOrder.setStudentId(stId);
             cloudTeacherOrder.setTime(cloudTeacherAddQueryInfo.getTimes());
             cloudTeacherOrder.setType(cloudTeacherAddQueryInfo.getAddType());
+            cloudTeacherOrder.setLevel(1);
             cloudTeacherOrderDao.insert(cloudTeacherOrder);
             this.addStudentCloudTeacher(cloudTeacherOrder);
         }

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

@@ -11,20 +11,19 @@ import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
+import com.ym.mec.biz.dal.entity.TenantInfo;
 import com.ym.mec.biz.dal.enums.EmployeeOperateEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.ParamEnum;
 import com.ym.mec.biz.dal.page.EmployeeQueryInfo;
-import com.ym.mec.biz.service.EmployeeService;
-import com.ym.mec.biz.service.ImGroupMemberService;
-import com.ym.mec.biz.service.ImUserFriendService;
-import com.ym.mec.biz.service.OaUserService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.im.entity.GroupMember;
@@ -68,6 +67,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	private CooperationOrganDao cooperationOrganDao;
 	@Autowired
 	private OaUserService oaUserService;
+    @Autowired
+    private TenantInfoService tenantInfoService;
 
 	@Override
 	public BaseDAO<Integer, Employee> getDAO() {
@@ -112,8 +113,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			employee.setAvatar(user.getAvatar());
 		}
 
-		//todo 添加到OA 临时注释
-//		oaUserService.addOaUser(employee);
+		//添加到OA
+		oaUserService.addOaUser(employee);
 	}
 
 	@Override
@@ -144,6 +145,15 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		imFeignService.update(new ImUserModel(employee.getUserId().toString(),employee.getRealName(),sysUser.getAvatar()));
 
 		employee.setAvatar(sysUser.getAvatar());
+        //更新机构信息
+        TenantInfo tenantInfo = tenantInfoService.getOne(new WrapperUtil<TenantInfo>()
+                .hasEq("user_id_",employee.getId()).queryWrapper());
+        if(Objects.nonNull(tenantInfo) && !Objects.equals(tenantInfo.getPhone(),employee.getPhone())){
+            tenantInfo.setPhone(employee.getPhone());
+            tenantInfo.setUpdatedTime(new Date());
+            tenantInfo.setUpdatedBy(sysUser.getId());
+            tenantInfoService.updateById(tenantInfo);
+        }
 
 		//更新OA信息
 		oaUserService.updateOaUser(employee);

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

@@ -7,8 +7,10 @@ import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
 import com.ym.mec.biz.service.MemberPrivilegesItemService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.PageInfo;
 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;
@@ -24,13 +26,15 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	@Autowired
 	private MemberRankPrivilegesDao memberRankPrivilegesDao;
 
+
+
 	@Override
 	public BaseDAO<Integer, MemberPrivilegesItem> getDAO() {
 		return memberPrivilegesItemDao;
 	}
 
 	private MemberPrivilegesItem getTree(MemberPrivilegesItem item){
-		List<MemberPrivilegesItem> privilegesItems = memberPrivilegesItemDao.findList(item.getId());
+		List<MemberPrivilegesItem> privilegesItems = memberPrivilegesItemDao.findList(item.getId(), TenantContextHolder.getTenantId());
 		if(privilegesItems != null && privilegesItems.size() > 0) {
 			item.setMemberPrivilegesItems(privilegesItems);
 			for (MemberPrivilegesItem privilegesItem : privilegesItems) {
@@ -52,7 +56,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 		if(memberRankPrivilegesDao.hasPrivileges(memberPrivilegesItemId)){
 			throw new BizException("删除失败：该功能已被使用");
 		}
-		List<MemberPrivilegesItem> memberPrivilegesItems = memberPrivilegesItemDao.findList(memberPrivilegesItemId);
+		List<MemberPrivilegesItem> memberPrivilegesItems = memberPrivilegesItemDao.findList(memberPrivilegesItemId,TenantContextHolder.getTenantId());
 		for (MemberPrivilegesItem item : memberPrivilegesItems) {
 			item = getTree(item);
 		}
@@ -80,7 +84,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 
 	@Override
 	public List<MemberPrivilegesItem> findAllItem(MemberPrivilegesItemQueryInfo queryInfo) {
-		List<MemberPrivilegesItem> rows = memberPrivilegesItemDao.findList(queryInfo.getParentId());
+		List<MemberPrivilegesItem> rows = memberPrivilegesItemDao.findList(queryInfo.getParentId(),TenantContextHolder.getTenantId());
 		if(rows == null || rows.size() == 0){
 			return rows;
 		}
@@ -93,7 +97,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateItem(MemberPrivilegesItem memberPrivilegesItem) {
-		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId());
+		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId(),TenantContextHolder.getTenantId());
 		if(itemList.size() == 0){
 			if(memberRankPrivilegesDao.hasPrivileges(memberPrivilegesItem.getParentId())){
 				throw new BizException("修改失败：被关联的子集不能被添加子功能");
@@ -116,7 +120,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void add(MemberPrivilegesItem memberPrivilegesItem) {
-		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId());
+		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId(),TenantContextHolder.getTenantId());
 		if(itemList.size() == 0){
 			if(memberRankPrivilegesDao.hasPrivileges(memberPrivilegesItem.getParentId())){
 				throw new BizException("修改失败：被关联的子集不能被添加子功能");

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

@@ -85,7 +85,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     @Override
     public void addTenantInfo(TenantInfoDto dto) {
         //校验手机号是否唯一
-        checkPhone(dto);
+        RBucket<Object> bucket = checkPhone(dto);
         //校验营业执照信息
         checkTsign(dto.getTsignCode());
 
@@ -106,6 +106,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                 tenantProductInfoService::addTenantProduct);
         //添加机构配置
         setIdByApply(tenantId, dto.getConfig(), dto.getConfig()::setTenantId, tenantConfigService::addConfig);
+        //释放
+        bucket.delete();
     }
 
     /**
@@ -114,25 +116,25 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateTenantInfo(TenantInfoDto dto) {
-        //机构id
-        Integer tenantId = Optional.ofNullable(dto)
-                .map(TenantInfoDto::getId)
-                .orElseThrow(() -> new BizException("机构信息不能为空!"));
-
         //查询机构信息
-        TenantInfo tenantInfo = this.getById(tenantId);
-        if (Objects.isNull(tenantInfo)) {
-            throw new BizException("未找到该机构信息!");
-        }
+        TenantInfo tenantInfo = Optional.ofNullable(dto)
+                .map(TenantInfoDto::getId)
+                .map(this::getById)
+                .orElseThrow(() -> new BizException("未找到该机构信息,机构信息不能为空!"));
 
         //机构状态 1已缴费，并且 机构注册的手机号与本次修改后的手机号不同，就证明本次修改了手机号 则需要修改机构的账号信息
         if (1 == tenantInfo.getPayState() && !Objects.equals(tenantInfo.getPhone(), dto.getPhone())) {
             //校验修改后的手机号是否是唯一
-            checkPhone(dto);
-            //修改机构用户手机号(登录账号)信息
-            SysUser tenantUser = sysUserFeignService.queryUserByMobile(tenantInfo.getPhone());
-            tenantUser.setPhone(dto.getPhone());
-            sysUserFeignService.updateSysUser(tenantUser);
+            RBucket<Object> bucket = checkPhone(dto);
+            //
+            if (Objects.nonNull(tenantInfo.getUserId())) {
+                //
+                SysUser tenantUser = sysUserFeignService.queryUserById(tenantInfo.getUserId());
+                tenantUser.setPhone(dto.getPhone());
+                sysUserFeignService.updateSysUser(tenantUser);
+            }
+            //释放锁
+            bucket.delete();
         }
 
         //机构状态 0未缴费
@@ -140,8 +142,10 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
             //校验营业执照信息
             checkTsign(dto.getTsignCode());
             //修改产品
-            setIdByApply(tenantId, dto.getProductInfo(), dto.getProductInfo()::setTenantId,
-                    tenantProductInfoService::updateTenantProduct);
+            if (Objects.nonNull(dto.getProductInfo())) {
+                setIdByApply(tenantInfo.getId(), dto.getProductInfo(), dto.getProductInfo()::setTenantId,
+                        tenantProductInfoService::updateTenantProduct);
+            }
         }
 
         Date now = new Date();
@@ -151,7 +155,9 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         this.updateById(tenantInfo);
 
         //修改机构配置
-        setIdByApply(tenantId, dto.getConfig(), dto.getConfig()::setTenantId, tenantConfigService::updateConfig);
+        if (Objects.nonNull(dto.getConfig())) {
+            setIdByApply(tenantInfo.getId(), dto.getConfig(), dto.getConfig()::setTenantId, tenantConfigService::updateConfig);
+        }
     }
 
     /**
@@ -195,33 +201,33 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      * 第一个启用默认激活账号等信息
      *
      * @param id    机构id
-     * @param state 机构状态 0草稿 1启动 2停用
+     * @param state 机构状态1启动 2停用
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void opsTenantState(Integer id, Integer state) {
-        if (Objects.nonNull(state)) {
-            if (state == 1 || state == 2) {
-                TenantInfo tenantInfo = baseMapper.selectById(id);
-                if (Objects.isNull(tenantInfo)) {
-                    throw new BizException("该机构数据异常! ID : [" + id + "]");
+        if (Objects.nonNull(state) && state == 1 || state == 2) {
+            TenantInfo tenantInfo = baseMapper.selectById(id);
+            if (Objects.isNull(tenantInfo)) {
+                throw new BizException("该机构数据异常! ID : [" + id + "]");
+            }
+            Integer userId = getUserId();
+            tenantInfo.setUpdatedBy(userId);
+            tenantInfo.setUpdatedTime(new Date());
+            tenantInfo.setState(state);
+            //状态= 开通
+            if (state == 1) {
+                if (tenantInfo.getPayState() == 0) {
+                    throw new BizException("机构未缴费无法开通!");
                 }
-                Integer userId = getUserId();
-                tenantInfo.setUpdatedBy(userId);
-                tenantInfo.setUpdatedTime(new Date());
-                tenantInfo.setState(state);
-                //状态= 开通并且已支付完成
-                if (state == 1) {
-                    if (tenantInfo.getPayState() == 1) {
-                        //判断是否初次启用
-                        firstOpen(tenantInfo);
-                    } else {
-                        throw new BizException("机构未缴费无法开通!");
-                    }
+                //已支付完成 并且 没有创建用户信息
+                if (tenantInfo.getPayState() == 1 && Objects.nonNull(tenantInfo.getUserId())) {
+                    //初次开通
+                    checkFirstOpen(tenantInfo);
                 }
-                baseMapper.updateById(tenantInfo);
-                return;
             }
+            baseMapper.updateById(tenantInfo);
+            return;
         }
         throw new BizException("传入机构状态参数异常!");
     }
@@ -231,7 +237,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      *
      * @param tenantInfo 机构信息
      */
-    private void firstOpen(TenantInfo tenantInfo) {
+    private void checkFirstOpen(TenantInfo tenantInfo) {
         Integer tenantId = tenantInfo.getId();
         SysUser user = sysUserFeignService.queryUserByMobile(tenantInfo.getPhone());
         if (Objects.nonNull(user)) {
@@ -267,8 +273,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         // 创建账号、用户信息、用户和角色关系
         createUser(tenantInfo, orgId, Lists.newArrayList(roleId));
         //建立角色和菜单关系数据
-         Lists.partition(collectMenuId, 200)
-                         .forEach(idList -> employeeService.batchInsertRoleMenu(roleId, idList, tenantId));
+        Lists.partition(collectMenuId, 50)
+                .forEach(idList -> employeeService.batchInsertRoleMenu(roleId, idList, tenantId));
         //创建资产信息
         TenantAssetsInfo assetsInfo = new TenantAssetsInfo();
         assetsInfo.setTenantId(tenantId);
@@ -276,6 +282,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         assetsInfo.setFrozenAmount(BigDecimal.ZERO);
         assetsInfo.setCreatedTime(new Date());
         assetsInfoService.save(assetsInfo);
+        //释放锁
+        bucket.delete();
     }
 
     //拆分菜单获取菜单ID
@@ -310,6 +318,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         e.setEntryDate(LocalDate.now().toDate());
         e.setRoles(roles);
         e.setRoleIds(roles);
+        e.setUserType(SysUserType.SYSTEM.getCode());
         e.setOrganIdList(String.valueOf(orgId));
         try {
             log.info("createUser >>>> {}", e);
@@ -461,9 +470,9 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     /**
      * 校验手机号
      */
-    private void checkPhone(TenantInfoDto dto) {
+    private RBucket<Object> checkPhone(TenantInfoDto dto) {
         //防止重复点击 加锁
-        String key = "Tenant_First_Add:" + dto.getPhone();
+        String key = "Tenant_Check_Phone:" + dto.getPhone();
         RBucket<Object> bucket = redissonClient.getBucket(key);
         //原子操作 抢锁成功为true
         if (!bucket.trySet(dto.getPhone(), 1L, TimeUnit.MINUTES)) {
@@ -475,9 +484,11 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                 .orElse(null);
         if (Objects.nonNull(sysUser)) {
             if (sysUser.getUserType().contains(SysUserType.SYSTEM.getCode())) {
+                bucket.delete();
                 throw new BizException("该手机号已被注册!");
             }
         }
+        return bucket;
     }
 
     /**
@@ -489,8 +500,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      * @param action    需要执行的操作
      */
     private <T> void setIdByApply(Integer tenantId, T clazz, Consumer<Integer> setOption, Consumer<T> action) {
-        Optional.ofNullable(tenantId)
-                .ifPresent(setOption);
+        setOption.accept(tenantId);
         action.accept(clazz);
     }
 

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

@@ -14,6 +14,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.thirdparty.adapay.Payment;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.LocalDateTime;
 import org.slf4j.Logger;
@@ -21,10 +22,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 机构付款记录表(TenantOrderRecord)表服务实现类
@@ -45,6 +43,9 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
     @Autowired
     private TenantInfoService tenantInfoService;
 
+    //订单不存在
+    public static final String PAYMENT_ID_NOT_EXISTS = "payment_id_not_exists";
+
     @Override
     public PageInfo<TenantOrderRecord> queryPage(TenantOrderRecordDto dto) {
         Page<TenantOrderRecord> pageInfo = PageUtil.getPage(dto.getPage(), dto.getRows());
@@ -54,28 +55,18 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         return PageUtil.pageInfo(baseMapper.queryPage(pageInfo, dto));
     }
 
+    /**
+     * 校验订单状态
+     *
+     * @param orderNo 我方订单编号
+     */
     @Override
     public Map<String, Object> checkTenantOrder(String orderNo) {
         TenantOrderRecord orderRecord = this.getOne(new WrapperUtil<TenantOrderRecord>()
                 .hasEq("order_no_", orderNo).queryWrapper());
-        if (StringUtils.equals(orderRecord.getPaymentChannel(), PaymentChannelEnum.ADAPAY.getCode())) {
-            Map<String, Object> payment;
-            try {
-                payment = Payment.queryPayment(orderRecord.getTransNo());
-                log.info("checkTenantOrder  payment >>>>> {}", payment);
-                if (Objects.nonNull(payment.get("status"))) {
-                    String status = (String) payment.get("status");
-                    if (status.equals("succeeded")) {
-                        orderRecord.setOrderState(1);
-                    } else if (status.equals("failed")) {
-                        orderRecord.setOrderState(2);
-                    }
-                }
-                log.info("checkTenantOrder  orderRecord >>>>> {}", JSON.toJSONString(orderRecord));
-            } catch (Exception e) {
-                log.error("checkTenantOrder  payment error>>>>> {}", JSON.toJSONString(orderRecord));
-            }
-        }
+
+        //主动去第三方查询订单状态
+        checkTransOrderState(orderRecord);
 
         //返回
         Map<String, Object> result = new HashMap<>();
@@ -96,6 +87,75 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         return result;
     }
 
+    @Override
+    public void checkTenantOrder() {
+        List<TenantOrderRecord> list = this.list(new WrapperUtil<TenantOrderRecord>().queryWrapper()
+                .isNotNull("trans_no_")
+                .eq("order_state_", 0));
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(record -> {
+                checkTransOrderState(record);
+                if (record.getOrderState() == 1) {
+                    //开通缴费
+                    if (TenantOrderRecordEnum.TENANT_OPEN.getCode().equals(record.getOrderType())) {
+                        //机构产品信息
+                        TenantProductInfo productInfo = tenantProductInfoService.getOne(new WrapperUtil<TenantProductInfo>()
+                                .hasEq("tenant_id_", record.getTenantId()).queryWrapper());
+                        //修改机构信息
+                        TenantInfo tenantInfo = new TenantInfo();
+                        tenantInfo.setId(record.getTenantId());
+                        tenantInfo.setPayState(1);
+                        tenantInfoService.updateById(tenantInfo);
+                        //修改机构产品信息
+                        productInfo.setPayDate(new Date());
+                        productInfo.setTenantId(record.getTenantId());
+                        tenantProductInfoService.updateById(productInfo);
+                    }
+                    //修改流水
+                    LocalDateTime now = LocalDateTime.now();
+                    record.setPayDate(now.toLocalDate().toDate());
+                    record.setPayTime(now.toDate());
+                    baseMapper.updateById(record);
+                }
+            });
+        }
+
+    }
+
+    //主动去第三方查询订单状态
+    private void checkTransOrderState(TenantOrderRecord orderRecord) {
+        if (StringUtils.equals(orderRecord.getPaymentChannel(), PaymentChannelEnum.ADAPAY.getCode())) {
+            Map<String, Object> payment;
+            try {
+                payment = Payment.queryPayment(orderRecord.getTransNo());
+                log.info("checkTenantOrder  payment >>>>> {}", payment);
+                boolean flag = false;
+                if (Objects.nonNull(payment.get("error_code"))) {
+                    if (!PAYMENT_ID_NOT_EXISTS.equals(payment.get("error_code"))) {
+                        //确保订单已经创建
+                        flag = true;
+                    }
+                } else {
+                    //没有异常
+                    flag = true;
+                }
+                log.info("checkTenantOrder  payment >>>>> {} flag {}", payment, flag);
+                //确保订单已经创建 再 判断状态是成功还是失败
+                if (flag && Objects.nonNull(payment.get("status"))) {
+                    String status = (String) payment.get("status");
+                    if (status.equals("succeeded")) {
+                        orderRecord.setOrderState(1);
+                    } else if (status.equals("failed")) {
+                        orderRecord.setOrderState(2);
+                    }
+                }
+                log.info("checkTenantOrder  orderRecord >>>>> {}", JSON.toJSONString(orderRecord));
+            } catch (Exception e) {
+                log.error("checkTenantOrder  payment error>>>>> {}", JSON.toJSONString(orderRecord));
+            }
+        }
+    }
+
     private void getOrderState(TenantOrderRecord orderRecord, Map<String, Object> result) {
         Map<String, Object> detail = (Map<String, Object>) result.get("detail");
         Map<String, Object> order = (Map<String, Object>) result.get("order");
@@ -138,6 +198,10 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         detail.put("mode", serveDetail.getMode());
         detail.put("num", productInfo.getExpiryCount());
 
+        orderSuccessOps(orderRecord, productInfo);
+    }
+
+    private void orderSuccessOps(TenantOrderRecord orderRecord, TenantProductInfo productInfo) {
         TenantInfo tenantInfo = new TenantInfo();
         tenantInfo.setId(orderRecord.getTenantId());
         tenantInfo.setPayState(1);

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

@@ -19,11 +19,12 @@
         <result column="month" property="month"/>
         <result column="organName" property="organName"/>
         <result column="userName" property="userName"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, inspection_id_, organ_id_, user_id_, item_, times_, planned_times_, submitted_times_,
-        memo_, operation_, create_time_, update_time_
+        memo_, operation_, create_time_, update_time_, tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="InspectionItem">
         <!--@mbg.generated-->
@@ -41,10 +42,10 @@
             useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inspection_item (inspection_id_, organ_id_, user_id_, item_, times_, planned_times_,
-        submitted_times_, memo_, operation_, create_time_, update_time_)
+        submitted_times_, memo_, operation_, create_time_, update_time_,tenant_id_)
         values (#{inspectionId}, #{organId}, #{userId}, #{item,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{times}, #{plannedTimes},
-        #{submittedTimes}, #{memo}, #{operation}, #{createTime}, #{updateTime})
+        #{submittedTimes}, #{memo}, #{operation}, #{createTime}, #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItem">
         <!--@mbg.generated-->
@@ -84,7 +85,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     <!-- 获取任务项数目及总次数 -->
     <select id="getItemCountAndTimes" resultMap="InspectionItem">
@@ -99,13 +100,13 @@
     <insert id="batchInsert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItem"
             useGeneratedKeys="true">
         INSERT INTO inspection_item (inspection_id_, organ_id_, user_id_, item_, times_,operation_, create_time_,
-        update_time_)
+        update_time_,tenant_id_)
         VALUE
         <foreach collection="inspectionItems" item="inspectionItem" separator=",">
             (#{inspectionItem.inspectionId}, #{inspectionItem.organId}, #{inspectionItem.userId},
             #{inspectionItem.item,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{inspectionItem.times},
             #{inspectionItem.operation},
-            #{inspectionItem.createTime}, #{inspectionItem.updateTime})
+            #{inspectionItem.createTime}, #{inspectionItem.updateTime},#{inspectionItem.tenantId})
         </foreach>
     </insert>
 
@@ -166,6 +167,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	ii.tenant_id_ = #{tenantId}
             <if test="searchType != null and searchType != ''">
                 <if test="searchType == 'INSPECTION_ITEM'">
                     AND ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ ='' AND DATE_FORMAT(i.month_,'%Y-%m-%d') >= #{searchStartTime}

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

@@ -13,10 +13,11 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="classInfo" property="classInfo"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_, plan_id_,course_schedule_id_, teacher_id_, check_item_, check_conclusion_, create_time_, update_time_
+        id_, plan_id_,course_schedule_id_, teacher_id_, check_item_, check_conclusion_, create_time_, update_time_, tenant_id_
     </sql>
     <select id="get" resultMap="InspectionItemPlanConclusion">
         <!--@mbg.generated-->
@@ -34,9 +35,9 @@
             parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inspection_item_plan_conclusion (plan_id_,course_schedule_id_, teacher_id_,check_item_,
-        check_conclusion_, create_time_,update_time_)
+        check_conclusion_, create_time_,update_time_,tenant_id_)
         values (#{planId}, #{courseScheduleId},#{teacherId}, #{checkItem}, #{checkConclusion},#{createTime},
-        #{updateTime})
+        #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
         <!--@mbg.generated-->
@@ -64,7 +65,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     <delete id="delByPlanIdAndCheckItem">
         DELETE
@@ -76,14 +77,14 @@
             parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion"
             useGeneratedKeys="true">
         INSERT INTO inspection_item_plan_conclusion (plan_id_,course_schedule_id_, teacher_id_, check_item_,
-        check_conclusion_,create_time_,update_time_)
+        check_conclusion_,create_time_,update_time_,tenant_id_)
         VALUE
         <foreach collection="inspectionItemPlanConclusions" item="inspectionItemPlanConclusion" separator=",">
             (#{inspectionItemPlanConclusion.planId},#{inspectionItemPlanConclusion.courseScheduleId},
             #{inspectionItemPlanConclusion.teacherId},
             #{inspectionItemPlanConclusion.checkItem},
             #{inspectionItemPlanConclusion.checkConclusion}, #{inspectionItemPlanConclusion.createTime},
-            #{inspectionItemPlanConclusion.updateTime})
+            #{inspectionItemPlanConclusion.updateTime},#{inspectionItemPlanConclusion.tenantId})
         </foreach>
     </insert>
 

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

@@ -26,6 +26,7 @@
         <result column="musicGroupName" property="musicGroupName"/>
         <result column="organName" property="organName"/>
         <result column="realName" property="realName"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
     <select id="get" parameterType="java.lang.Long" resultMap="InspectionItemPlan">
         <!--@mbg.generated-->
@@ -43,10 +44,10 @@
         insert into inspection_item_plan (inspection_id_, item_id_, user_id_,operator_user_id_, plan_start_, plan_end_,
         organ_id_,cooperation_organ_id_,
         music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_,
-        create_time_, update_time_)
+        create_time_, update_time_,tenant_id_)
         values (#{inspectionId}, #{itemId}, #{userId},#{operatorUserId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
         #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo},#{conclusionStatus},#{status},
-        #{createTime}, #{updateTime})
+        #{createTime}, #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan">
         <!--@mbg.generated-->
@@ -104,7 +105,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -129,6 +130,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="itemId != null">
                 AND iip.item_id_ = #{itemId}
             </if>

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

@@ -14,12 +14,13 @@
         <result column="update_time_" property="updateTime"/>
         <result column="organName" property="organName"/>
         <result column="userName" property="userName"/>
+		<result column="tenant_id_" property="tenantId" />
         <collection property="inspectionItems" columnPrefix="ie_" ofType="com.ym.mec.biz.dal.entity.InspectionItem"
                     resultMap="com.ym.mec.biz.dal.dao.InspectionItemDao.InspectionItem"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_, organ_id_, user_id_, month_, memo_, operation_, create_time_, update_time_
+        id_, organ_id_, user_id_, month_, memo_, operation_, create_time_, update_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="Inspection">
         <!--@mbg.generated-->
@@ -35,8 +36,8 @@
     </delete>
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.Inspection"
             useGeneratedKeys="true">
-        insert into inspection (organ_id_, user_id_, month_, operation_, create_time_, update_time_)
-        values (#{organId}, #{userId}, #{month}, #{operation}, #{createTime}, #{updateTime})
+        insert into inspection (organ_id_, user_id_, month_, operation_, create_time_, update_time_,tenant_id_)
+        values (#{organId}, #{userId}, #{month}, #{operation}, #{createTime}, #{updateTime}, #{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Inspection">
         <!--@mbg.generated-->
@@ -64,7 +65,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -85,6 +86,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(i.organ_id_,#{organId})
             </if>

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

@@ -8,9 +8,10 @@
     <result column="available_amount_" property="availableAmount" jdbcType="BIGINT" />
     <result column="modify_on_" property="modifyOn" jdbcType="TIMESTAMP" />
     <result column="group_id_" property="groupId"/>
+		<result column="tenant_id_" property="tenantId" />
   </resultMap>
   <sql id="Base_Column_List" >
-    user_id_, used_count_, available_count_, available_amount_, modify_on_,group_id_
+    user_id_, used_count_, available_count_, available_amount_, modify_on_,group_id_,tenant_id_
   </sql>
   
   <select id="get" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -28,7 +29,7 @@
   </select>
   
   <select id="findAll" resultMap="BaseResultMap">
-    select * from luck_draw_count
+    select * from luck_draw_count where tenant_id_ = #{tenantId}
   </select>
   <select id="findByIdAndGroupId" resultMap="BaseResultMap">
     SELECT * FROM luck_draw_count WHERE user_id_ = #{userId} AND group_id_ = #{groupId}
@@ -44,9 +45,9 @@
   
   <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.LuckDrawCount" >
     insert into luck_draw_count (user_id_, used_count_, available_count_, available_amount_,
-      modify_on_,group_id_)
+      modify_on_,group_id_,tenant_id_)
     values (#{userId}, #{usedCount}, #{availableCount}, #{availableAmount},
-      NOW(),#{groupId})
+      NOW(),#{groupId},#{tenantId})
   </insert>
   
   <update id="update" parameterType="com.ym.mec.biz.dal.entity.LuckDrawCount" >
@@ -68,6 +69,6 @@
         modify_on_ = #{modifyOn,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where user_id_ = #{userId,jdbcType=BIGINT}
+    where user_id_ = #{userId,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
   </update>
 </mapper>

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

@@ -9,10 +9,11 @@
     <result column="start_time_" property="startTime" jdbcType="TIMESTAMP" />
     <result column="end_time_" property="endTime" jdbcType="TIMESTAMP" />
     <result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
+		<result column="tenant_id_" property="tenantId" />
   </resultMap>
   
   <sql id="Base_Column_List" >
-    id_, name_, consume_type_, consume_value_, start_time_, end_time_, create_on_
+    id_, name_, consume_type_, consume_value_, start_time_, end_time_, create_on_, tenant_id_
   </sql>
   
   <select id="get" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -23,7 +24,7 @@
   </select>
   
   <select id="findAll" resultMap="BaseResultMap" parameterType="map" >
-    select * from luck_draw_group
+    select * from luck_draw_group where tenant_id_ = #{tenantId}
   </select>
   
   <delete id="delete" parameterType="java.lang.Integer" >
@@ -33,10 +34,10 @@
   
   <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.LuckDrawGroup" >
     insert into luck_draw_group (id_, name_, consume_type_, consume_value_,
-      start_time_, end_time_, create_on_
+      start_time_, end_time_, create_on_, tenant_id_
       )
     values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{consumeType,jdbcType=VARCHAR}, #{consumeValue,jdbcType=INTEGER},
-      #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{createOn,jdbcType=TIMESTAMP}
+      #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{createOn,jdbcType=TIMESTAMP}, #{tenantId}
       )
   </insert>
 
@@ -62,12 +63,13 @@
         create_on_ = #{createOn,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where id_ = #{id,jdbcType=INTEGER}
+    where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
   </update>
 
 	<select id="queryCount" parameterType="map" resultType="int">
 		select count(*) from luck_draw_group
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null">
 				and name_ like concat('%',#{search},'%')
 			</if>
@@ -77,6 +79,7 @@
 	<select id="queryPage" parameterType="map" resultMap="BaseResultMap">
 		select * from luck_draw_group
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null">
 				and name_ like concat('%',#{search},'%')
 			</if>

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

@@ -9,6 +9,7 @@
 		<result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
 		<result column="name_" property="luckDrawPrize.name" jdbcType="VARCHAR" />
 		<result column="reward_type_" property="luckDrawPrize.rewardType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<resultMap id="BaseResultMapExt" type="com.ym.mec.biz.dal.entity.LuckDrawLog" extends="BaseResultMap">
@@ -18,7 +19,7 @@
 	</resultMap>
 
 	<sql id="Base_Column_List">
-		l.id_,l.group_id_, l.prize_id_,d.name_,d.reward_type_, l.user_id_, l.create_on_
+		l.id_,l.group_id_, l.prize_id_,d.name_,d.reward_type_, l.user_id_, l.create_on_,l.tenant_id_
 	</sql>
 
 	<select id="get" resultMap="BaseResultMap" parameterType="java.lang.Long">
@@ -38,11 +39,11 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.LuckDrawLog">
 		insert into
 		luck_draw_log (id_,group_id_, prize_id_, user_id_,
-		create_on_)
+		create_on_,tenant_id_)
 		values
 		(#{id,jdbcType=BIGINT}, #{groupId,jdbcType=INTEGER}, #{prizeId,jdbcType=INTEGER},
 		#{userId,jdbcType=BIGINT},
-		#{createOn,jdbcType=TIMESTAMP})
+		#{createOn,jdbcType=TIMESTAMP},#{tenantId})
 	</insert>
 
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.LuckDrawLog">
@@ -61,7 +62,7 @@
 				create_on_ = #{createOn,jdbcType=TIMESTAMP},
 			</if>
 		</set>
-		where id_ = #{id,jdbcType=BIGINT}
+		where id_ = #{id,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
 	</update>
 
 	<select id="queryCount" parameterType="map" resultType="int">
@@ -91,6 +92,7 @@
 
     <sql id="queryCondition">
 		<where>
+			l.tenant_id_ = #{tenantId}
 			<if test="prizeId != null">
 				AND l.prize_id_ = #{id}
 			</if>

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

@@ -13,14 +13,16 @@
 		<result column="is_default_" property="isDefault" />
 		<result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
 		<result column="modify_on_" property="modifyOn" jdbcType="TIMESTAMP" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<sql id="Base_Column_List">
-		id_, name_, chances_, stock_, enabled_, reward_type_, memo_, group_id_, is_default_, create_on_, modify_on_
+		id_, name_, chances_, stock_, enabled_, reward_type_, memo_, group_id_, is_default_, create_on_, modify_on_, tenant_id_
 	</sql>
 
 	<sql id="queryCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="enabled != null">
 				and enabled_ = #{enabled}
 			</if>
@@ -68,23 +70,23 @@
             keyProperty="id">
 		insert into luck_draw_prize (id_, name_, chances_,
 		stock_, enabled_, reward_type_, memo_, group_id_, is_default_, create_on_,
-		modify_on_)
+		modify_on_,tenant_id_)
 		values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR},
 		#{chances,jdbcType=DOUBLE},
 		#{stock,jdbcType=INTEGER}, #{enabled,jdbcType=BIT},#{rewardType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{memo,jdbcType=VARCHAR}, #{groupId,jdbcType=INTEGER}, #(isDefault), #{createOn,jdbcType=TIMESTAMP},
-		#{modifyOn,jdbcType=TIMESTAMP})
+		#{modifyOn,jdbcType=TIMESTAMP},#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
 		insert into luck_draw_prize (id_, name_, chances_,
 		stock_, enabled_, reward_type_, memo_, group_id_, is_default_, create_on_,
-		modify_on_) values 
+		modify_on_,tenant_id_) values 
 		<foreach collection="list" item="item" separator=",">
 		(#{item.id,jdbcType=INTEGER}, #{item.name,jdbcType=VARCHAR},
 		#{item.chances,jdbcType=DOUBLE}, #{item.stock,jdbcType=INTEGER}, 
 		#{item.enabled,jdbcType=BIT},#{item.rewardType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{item.memo,jdbcType=VARCHAR}, #{item.groupId,jdbcType=INTEGER}, #{item.isDefault}, now(), now())
+		#{item.memo,jdbcType=VARCHAR}, #{item.groupId,jdbcType=INTEGER}, #{item.isDefault}, now(), now(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -122,7 +124,7 @@
 				modify_on_ = #{modifyOn,jdbcType=TIMESTAMP},
 			</if>
 		</set>
-		where id_ = #{id,jdbcType=INTEGER}
+		where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="batchUpdate">
 		<foreach collection="updateDraw" item="draw" separator=";">
@@ -154,7 +156,7 @@
 				</if>
 				modify_on_ = NOW()
 			</set>
-			WHERE id_ = #{draw.id,jdbcType=INTEGER}
+			WHERE id_ = #{draw.id,jdbcType=INTEGER} and tenant_id_ = #{draw.tenantId}
 		</foreach>
 	</update>
 

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

@@ -12,6 +12,7 @@
         <result column="status_" property="status"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
 
     <select id="get" parameterType="java.lang.Integer" resultMap="ManagerDownload">
@@ -28,10 +29,10 @@
             useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into manager_download (user_id_, name_, file_url_,type_,
-        status_, create_time_, update_time_
+        status_, create_time_, update_time_,tenant_id_
         )
         values (#{userId}, #{name}, #{fileUrl},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{status}, #{createTime}, #{updateTime}
+        #{status}, #{createTime}, #{updateTime},#{tenantId}
         )
     </insert>
 
@@ -54,7 +55,7 @@
             create_time_ = NOW(),
             update_time_ = NOW(),
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -73,6 +74,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="userId != null">
                 AND user_id_ = #{userId}
             </if>

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

@@ -12,6 +12,7 @@
 		<result column="activity_ids_" property="activityIds" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -21,13 +22,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MarketActivity">
-		SELECT * FROM market_activity ORDER BY id_
+		SELECT * FROM market_activity where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MarketActivity" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO market_activity (name_,activity_ids_,create_time_,update_time_)
-		VALUES(#{name},#{activityIds},#{createTime},#{updateTime})
+		INSERT INTO market_activity (name_,activity_ids_,create_time_,update_time_,tenant_id_)
+		VALUES(#{name},#{activityIds},#{createTime},#{updateTime},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -40,7 +41,7 @@
 		activity_ids_ = #{activityIds},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -49,7 +50,7 @@
 	</delete>
 	<sql id="queryPageSql">
 		<where>
-			1=1
+			tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (name_ LIKE CONCAT('%',#{search},'%') OR id_ = #{search} OR FIND_IN_SET(#{search},activity_ids_))
 			</if>

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

@@ -21,6 +21,7 @@
 		<result column="current_year_fee_" property="currentYearFee" />
 		<result column="group_purchase_year_fee_" property="groupPurchaseYearFee" />
 		<result column="original_year_fee_" property="originalYearFee" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -31,7 +32,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MemberFeeSetting">
-		SELECT * FROM member_fee_setting
+		SELECT * FROM member_fee_setting where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -41,8 +42,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO member_fee_setting
-		(id_,current_day_fee_,group_purchase_day_fee_,original_day_fee_,current_month_fee_,group_purchase_month_fee_,original_month_fee_,current_quarterly_fee_,group_purchase_quarterly_fee_,original_quarterly_fee_,current_half_year_fee_,group_purchase_half_year_fee_,original_half_year_fee_,current_year_fee_,group_purchase_year_fee_,original_year_fee_)
-		VALUES(#{id},#{currentDayFee},#{groupPurchaseDayFee},#{originalDayFee},#{currentMonthFee},#{groupPurchaseMonthFee},#{originalMonthFee},#{currentQuarterlyFee},#{groupPurchaseQuarterlyFee},#{originalQuarterlyFee},#{currentHalfYearFee},#{groupPurchaseHalfYearFee},#{originalHalfYearFee},#{currentYearFee},#{groupPurchaseYearFee},#{originalYearFee})
+		(id_,current_day_fee_,group_purchase_day_fee_,original_day_fee_,current_month_fee_,group_purchase_month_fee_,original_month_fee_,current_quarterly_fee_,group_purchase_quarterly_fee_,original_quarterly_fee_,current_half_year_fee_,group_purchase_half_year_fee_,original_half_year_fee_,current_year_fee_,group_purchase_year_fee_,original_year_fee_,tenant_id_)
+		VALUES(#{id},#{currentDayFee},#{groupPurchaseDayFee},#{originalDayFee},#{currentMonthFee},#{groupPurchaseMonthFee},#{originalMonthFee},#{currentQuarterlyFee},#{groupPurchaseQuarterlyFee},#{originalQuarterlyFee},#{currentHalfYearFee},#{groupPurchaseHalfYearFee},#{originalHalfYearFee},#{currentYearFee},#{groupPurchaseYearFee},#{originalYearFee},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -68,20 +69,20 @@
 				original_month_fee_ = #{originalMonthFee},
 				original_year_fee_ = #{originalYearFee}
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MemberFeeSetting"
 		parameterType="map">
-		SELECT * FROM member_fee_setting ORDER BY id_
+		SELECT * FROM member_fee_setting where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM
-		member_fee_setting
+		member_fee_setting where tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="findByRankIdAndOrganId" resultMap="MemberFeeSetting">

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

@@ -17,6 +17,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="rank_name_" property="rankName" />
 		<result column="organ_name_" property="organName" />
+		<result column="tenant_id_" property="tenantId" />
 		<association property="memberFeeSetting" javaType="com.ym.mec.biz.dal.entity.MemberFeeSetting">
 			<result property="id" column="member_fee_setting_id_"/>
 			<result column="current_day_fee_" property="currentDayFee" />
@@ -47,13 +48,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MemberRankOrganizationFeeMapper">
-		SELECT mrofm.* FROM member_rank_organization_fee_mapper mrofm
+		SELECT mrofm.* FROM member_rank_organization_fee_mapper mrofm where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO member_rank_organization_fee_mapper (organ_id_,member_rank_setting_id_,member_fee_setting_id_,operator_id_,create_time_,update_time_)
-		VALUES(#{organId},#{memberRankSettingId},#{memberFeeSettingId},#{operatorId},NOW(),NOW())
+		INSERT INTO member_rank_organization_fee_mapper (organ_id_,member_rank_setting_id_,member_fee_setting_id_,operator_id_,create_time_,update_time_,tenant_id_)
+		VALUES(#{organId},#{memberRankSettingId},#{memberFeeSettingId},#{operatorId},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper">
@@ -71,7 +72,7 @@
 			operator_id_ = #{operatorId},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 分页查询 -->
@@ -83,6 +84,7 @@
 		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
 		LEFT JOIN sys_user su ON su.id_ = mrofm.operator_id_
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
 			</if>
@@ -99,6 +101,7 @@
 		SELECT COUNT(mrofm.id_) FROM member_rank_organization_fee_mapper mrofm
 		LEFT JOIN member_rank_setting mrs ON  mrofm.member_rank_setting_id_ = mrs.id_
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
 			</if>

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

@@ -23,6 +23,7 @@
 		<result column="remark_" property="remark" />
 		<result column="create_time_" property="createTime"/>
 		<result column="update_time_" property="updateTime"/>
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -32,7 +33,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicEnlightenmentQuestionnaire">
-		SELECT * FROM music_enlightenment_questionnaire ORDER BY id_
+		SELECT * FROM music_enlightenment_questionnaire where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -42,8 +43,8 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO music_enlightenment_questionnaire (music_group_id_,user_id_,user_name_,phone_,current_grade_,current_grade_num_,current_class_,teacher_recommand_subject_id_,musical_instruments_learning_,musical_instruments_name_,join_parent_meeting_,remark_,create_time_,update_time_)
-		VALUES(#{musicGroupId},#{userId},#{userName},#{phone},#{currentGrade},#{currentGradeNum},#{currentClass},#{teacherRecommandSubjectId},#{musicalInstrumentsLearning},#{musicalInstrumentsName},#{joinParentMeeting},#{remark},NOW(),NOW())
+		INSERT INTO music_enlightenment_questionnaire (music_group_id_,user_id_,user_name_,phone_,current_grade_,current_grade_num_,current_class_,teacher_recommand_subject_id_,musical_instruments_learning_,musical_instruments_name_,join_parent_meeting_,remark_,create_time_,update_time_,tenant_id_)
+		VALUES(#{musicGroupId},#{userId},#{userName},#{phone},#{currentGrade},#{currentGradeNum},#{currentClass},#{teacherRecommandSubjectId},#{musicalInstrumentsLearning},#{musicalInstrumentsName},#{joinParentMeeting},#{remark},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -86,7 +87,7 @@
 			</if>
 			update_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -96,6 +97,7 @@
 
 	<sql id="queryCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="musicGroupId!=null and musicGroupId!=''">
 				AND meq.music_group_id_=#{musicGroupId}
 			</if>

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

@@ -148,8 +148,8 @@
     <insert id="addSysUser" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_user
-        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,password_)
-        VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
+        (tenant_id_,im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,password_)
+        VALUES(#{tenantId},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
         #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{password})
     </insert>
 

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

@@ -12,24 +12,25 @@
         <result column="logo_" jdbcType="VARCHAR" property="logo"/>
         <result column="customer_service_phone_" jdbcType="VARCHAR" property="customerServicePhone"/>
         <result column="remark_" jdbcType="VARCHAR" property="remark"/>
+        <result column="tsign_code_" jdbcType="VARCHAR" property="tsignCode"/>
+        <result column="tsign_name_" jdbcType="VARCHAR" property="tsignName"/>
+        <result column="area_id_" jdbcType="INTEGER" property="areaId"/>
         <result column="domain_name_" jdbcType="VARCHAR" property="domainName"/>
         <result column="data_source_" jdbcType="VARCHAR" property="dataSource"/>
         <result column="pay_state_" jdbcType="INTEGER" property="payState"/>
         <result column="state_" jdbcType="INTEGER" property="state"/>
+        <result column="user_id_" jdbcType="INTEGER" property="userId"/>
         <result column="created_by_" jdbcType="INTEGER" property="createdBy"/>
         <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
         <result column="updated_by_" jdbcType="INTEGER" property="updatedBy"/>
         <result column="updated_time_" jdbcType="TIMESTAMP" property="updatedTime"/>
-        <result column="tsign_code_" jdbcType="VARCHAR" property="tsignCode"/>
-        <result column="tsign_name_" jdbcType="VARCHAR" property="tsignName"/>
-        <result column="area_id_" jdbcType="INTEGER" property="areaId"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id_
         , name_, contacts_, phone_, address_, email_, logo_, customer_service_phone_, remark_, domain_name_,
         data_source_, pay_state_, state_, created_by_, created_time_, updated_by_, updated_time_, tsign_code_, tsign_name_,
-        area_id_
+        area_id_,user_id_
     </sql>
 
     <resultMap id="TenantInfoInfoResult" type="com.ym.mec.biz.dal.vo.TenantInfoInfoPageVo">

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -223,4 +223,10 @@ public interface TaskRemoteService {
 	 */
 	@GetMapping("task/remarkCountFlag")
     void remarkCountFlag();
+
+    /**
+     * 定时校验-机构订单状态
+     */
+	@GetMapping("task/checkTenantOrder")
+    void checkTenantOrder();
 }

mec-client-api/src/main/java/com/ym/mec/task/fallback/TaskRemoteServiceFallback.java

@@ -277,4 +277,9 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
     public void remarkCountFlag() {
         logger.error("标记进行中乐团在读学员+VIP、网管有课学员总数 失败");
     }
+
+    @Override
+    public void checkTenantOrder() {
+        logger.error("校验机构付款记录支付状态失败");
+    }
 }

mec-task/src/main/java/com/ym/mec/task/jobs/CheckTenantOrder.java

@@ -0,0 +1,24 @@
+package com.ym.mec.task.jobs;
+
+import com.ym.mec.task.TaskRemoteService;
+import com.ym.mec.task.core.BaseTask;
+import com.ym.mec.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author hgw
+ * Created by 2021-12-24
+ */
+@Service
+public class CheckTenantOrder extends BaseTask {
+
+    @Autowired
+    private TaskRemoteService taskRemoteService;
+
+    @Override
+    public void execute() throws TaskException {
+        taskRemoteService.checkTenantOrder();
+    }
+
+}

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

@@ -106,6 +106,8 @@ public class TaskController extends BaseController {
 	private SysMusicCompareRecordService sysMusicCompareRecordService;
 	@Autowired
 	private TenantInfoService tenantInfoService;
+    @Autowired
+    private TenantOrderRecordService tenantOrderRecordService;
 
 	@GetMapping(value = "/syncImHistoryMessageTask")
 	// 同步即时通讯聊天记录
@@ -509,4 +511,10 @@ public class TaskController extends BaseController {
 	public void remarkCountFlag(){
 //		studentService.remarkCountFlag();
 	}
+
+    @ApiOperation("定时校验-机构订单状态")
+    @GetMapping(value = "/checkTenantOrder")
+    public void checkTenantOrder(){
+        tenantOrderRecordService.checkTenantOrder();
+    }
 }