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

cms/src/main/java/com/ym/mec/cms/interceptor/OperationLogInterceptor.java

@@ -24,8 +24,8 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+		if (sysUser != null && sysUser.getId() != null) {
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/interceptor/OperationLogInterceptor.java

@@ -28,7 +28,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 			SysUser sysUser = sysUserService.get(authUser.getUserId());
 
 			if (sysUser != null) {
-				setUsername(sysUser.getRealName(), sysUser.getId());
+				setUsername(sysUser.getRealName(), sysUser.getId(), sysUser.getTenantId() + "");
 			}
 		}
 		return true;

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

@@ -806,7 +806,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         if (Objects.isNull(user)) {
             throw new BizException("未查询到学员信息！");
         }
-        param.put("user", user.getId());
+        param.put("userId", user.getId());
         String queryDateStr = WrapperUtil.toStr(param, "queryDate", "请选择查询日期！");
         Date startDate = DateUtils.parseDate(queryDateStr + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
         Date endDate = DateUtils.addMonths(startDate, 1);

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

@@ -94,6 +94,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     private SysMessageService sysMessageService;
     @Autowired
     private TenantInfoSendMsgService tenantInfoSendMsgService;
+    @Autowired
+    private SysConfigService sysConfigService;
 
     /**
      * 新增机构
@@ -440,12 +442,16 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      * 机构开通缴费
      */
     public Map<String, Object> tenantOpenPay(Integer tenantId) throws Exception {
+        SysConfig config = sysConfigService.findByParamName("platform_collection_organ");
+        if(Objects.isNull(config)){
+            throw new BizException("未查询到机构收款分部信息！");
+        }
+
         TenantOrderRecordEnum tenantEnum = TenantOrderRecordEnum.TENANT_OPEN;
         Map<String, Object> result = new HashMap<>();
         TenantProductInfo productInfo = getProductInfo(tenantId);
         //生成订单编号
         String orderNo = idGenerator.generatorId("payment") + "";
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
         int orderState = 0;
         //消费大于0元则拉起支付
         if (productInfo.getPayAmount().compareTo(BigDecimal.ZERO) > 0) {
@@ -453,11 +459,11 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     productInfo.getPayAmount(),
                     BigDecimal.ZERO,
                     orderNo,
-                    baseApiUrl + "/api-web/tenantInfo/notify",
-                    baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
+                    null,
+                    null,
                     tenantEnum.getMsg(),
                     tenantEnum.getMsg(),
-                    1,//todo 机构开通付款临时写死
+                    config.getParanValue(Integer.class),
                     tenantEnum.getCode()
             );
         } else {
@@ -482,6 +488,11 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      * @param val      购买周期
      */
     public Map<String, Object> tenantRenewPay(Integer tenantId, Integer val) throws Exception {
+        SysConfig config = sysConfigService.findByParamName("platform_collection_organ");
+        if(Objects.isNull(config)){
+            throw new BizException("未查询到机构收款分部信息！");
+        }
+
         TenantOrderRecordEnum tenantEnum = TenantOrderRecordEnum.TENANT_RENEW;
         Map<String, Object> result = new HashMap<>();
         TenantProductInfo productInfo = getProductInfo(tenantId);
@@ -500,7 +511,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     null,
                     tenantEnum.getMsg(),
                     tenantEnum.getMsg(),
-                    1,//临时写死
+                    config.getParanValue(Integer.class),
                     tenantEnum.getCode()
             );
             //操作续费信息，把续费周期存起来
@@ -695,6 +706,10 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
 
     @Override
     public Map<String, Object> recharge(Integer tenantId, BigDecimal amount) throws Exception {
+        SysConfig config = sysConfigService.findByParamName("platform_collection_organ");
+        if(Objects.isNull(config)){
+            throw new BizException("未查询到机构收款分部信息！");
+        }
         log.error("机构 " + tenantId.toString() + "充值");
         Optional.of(tenantId)
                 .map(baseMapper::selectById)
@@ -720,7 +735,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     null,
                     tenantEnum.getMsg(),
                     tenantEnum.getMsg(),
-                    1,//临时写死
+                    config.getParanValue(Integer.class),
                     tenantEnum.getCode()
             );
         } else {

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

@@ -21,12 +21,12 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="SysSuggestion">
-		SELECT * FROM sys_suggestion WHERE id_ = #{id} and tenant_id_ = #{tenantId}
+		SELECT * FROM sys_suggestion WHERE id_ = #{id}
 	</select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysSuggestion">
-		SELECT * FROM sys_suggestion where tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT * FROM sys_suggestion ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -72,7 +72,6 @@
 
     <sql id="queryCondition">
         <where>
-            ss.tenant_id_ = #{tenantId}
             <if test="type!=null">
                 AND ss.type_ = #{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -43,6 +43,8 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
     private String username;
 
     private Integer userId;
+    
+    private String tenantId;
 
     private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -147,8 +149,9 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
         auditLogService.insert(auditLog);
     }
 
-    public void setUsername(String username, Integer userId) {
+    public void setUsername(String username, Integer userId, String tenantId) {
         this.username = username;
         this.userId = userId;
+        this.tenantId = tenantId;
     }
 }

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

@@ -1,73 +0,0 @@
-package com.ym.mec.student.controller;
-
-import com.ym.mec.biz.dal.entity.CloudTeacherStudent;
-import com.ym.mec.biz.dal.entity.TenantOrderRecord;
-import com.ym.mec.biz.dal.page.CloudTeacherAddQueryInfo;
-import com.ym.mec.biz.dal.page.CloudTeacherOrderQueryInfo;
-import com.ym.mec.biz.service.CloudTeacherOrderService;
-import com.ym.mec.biz.service.TenantOrderRecordService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.WrapperUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Description
- *
- * @author: feng-ji
- * @date: 2021-12-21
- */
-@RequestMapping("cloudTeacherOrder")
-@Api(tags = "团练宝注册,激活,添加用户,支付等")
-@RestController
-public class CloudTeacherOrderController extends BaseController {
-
-    @Autowired
-    private CloudTeacherOrderService cloudTeacherOrderService;
-
-    @Autowired
-    private TenantOrderRecordService tenantOrderRecordService;
-
-    @ApiOperation(value = "查询未激活团练宝用户")
-    @PostMapping("/queryInactive")
-    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryInActive')")
-    public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryInactive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
-        cloudTeacherOrderQueryInfo.setStatus(1);
-        // 学生端不要乐团限制， 返回学生会重复
-        // if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
-        //     throw new Exception("乐团Id必须填写");
-        // }
-        return succeed(cloudTeacherOrderService.queryInactive(cloudTeacherOrderQueryInfo));
-    }
-
-    @ApiOperation(value = "查询已激活团练宝用户")
-    @PostMapping("/queryActive")
-    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActive')")
-    public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryActive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
-        cloudTeacherOrderQueryInfo.setStatus(2);
-        return succeed(cloudTeacherOrderService.queryInactive(cloudTeacherOrderQueryInfo));
-    }
-
-    @ApiOperation(value = "激活记录")
-    @PostMapping("/queryActiveRecord")
-    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActiveRecord')")
-    public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryActiveRecord(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) {
-        return succeed(cloudTeacherOrderService.queryRecord(cloudTeacherOrderQueryInfo));
-    }
-
-    @ApiOperation(value = "轮询查询订单状态")
-    @GetMapping("/payCheck")
-    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/payCheck')")
-    public HttpResponseResult<Boolean> payCheck(@RequestParam String orderNo) throws Exception {
-        return succeed(cloudTeacherOrderService.payCheck(orderNo));
-    }
-
-}

mec-student/src/main/java/com/ym/mec/student/interceptor/OperationLogInterceptor.java

@@ -22,8 +22,8 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+		if (sysUser != null && sysUser.getId() != null) {
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/OperationLogInterceptor.java

@@ -22,8 +22,8 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+		if (sysUser != null && sysUser.getId() != null) {
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}

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

@@ -52,9 +52,10 @@ public class CloudTeacherOrderController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryInActive')")
     public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryInactive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
         cloudTeacherOrderQueryInfo.setStatus(1);
-        if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
-            throw new Exception("乐团Id必须填写");
-        }
+        // 去掉按乐团查询， 不同乐团学生有重复
+        // if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
+        //     throw new Exception("乐团Id必须填写");
+        // }
         return succeed(cloudTeacherOrderService.queryInactive(cloudTeacherOrderQueryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/interceptor/OperationLogInterceptor.java

@@ -24,8 +24,8 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+		if (sysUser != null && sysUser.getId() != null) {
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}

mec-websocket/src/main/java/com/ym/mec/web/interceptor/OperationLogInterceptor.java

@@ -25,7 +25,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}