submit

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -1,25 +1,23 @@
 package com.zhongzheng.controller.user;
 
 import cn.hutool.core.lang.Validator;
-import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.SysUser;
-import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.controller.alioss.OssController;
 import com.zhongzheng.framework.web.service.WxLoginService;
 import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.UserWxFollow;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserVisitLogService;
 import com.zhongzheng.modules.user.service.IUserWxFollowService;
-import com.zhongzheng.modules.user.vo.RanKingUser;
 import com.zhongzheng.modules.user.vo.UserVo;
 import com.zhongzheng.modules.wx.bo.WxLoginBody;
 import io.swagger.annotations.Api;
@@ -56,6 +54,8 @@ public class UserController extends BaseController {
 
     private final WxLoginService wxLoginService;
 
+    private final ISysTenantService sysTenantService;
+
     private static Logger log = LoggerFactory.getLogger(UserController.class);
     /**
      * 修改客户端用户
@@ -119,6 +119,12 @@ public class UserController extends BaseController {
             vo.setUserFollowWx(1);
         }
         vo.setNull();
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        if (StringUtils.isNotBlank(tenantId)){
+            SysTenant tenant = sysTenantService.getById(Long.valueOf(tenantId));
+            vo.setEduPhone(tenant.getEduPhone());
+        }
+
         bo.setUserId(loginUser.getUser().getUserId());
         iUserVisitLogService.insertByAddBo(bo);
         return AjaxResult.success(vo);

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SysTenantServiceImpl.java

@@ -3,7 +3,6 @@ package com.zhongzheng.framework.web.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -36,7 +35,6 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -471,6 +469,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         tenant.setBillDay(bo.getBillDay());
         tenant.setAccountInformation(JSONArray.toJSONString(bo.getAccountList()));
         tenant.setInvoiceInformation(JSONObject.toJSONString(bo.getInvoiceBo()));
+        tenant.setEduPhone(bo.getEduPhone());
         return updateById(tenant);
     }
 

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -965,7 +965,7 @@ public class WxLoginService implements IWxLoginService {
         JSONObject obj = new JSONObject();
         obj.put("page", "pages5/mockExam/examApply");
         obj.put("scene",String.format("tid=%s",activityId));
-        obj.put("env_version",enCodeVersion);
+        obj.put("env_version","trial");
         String result = HttpUtils.sendPost(url, obj);
         if (result.contains("errcode")){
             List<String> codes = Arrays.asList("40001", "42001");

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -286,5 +286,7 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	@ApiModelProperty("学习记录同步到老系统时间")
 	private Long toOldTime;
 
+	@ApiModelProperty("月份")
+	private Integer month;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysTopTenantAddBo.java

@@ -43,4 +43,7 @@ public class SysTopTenantAddBo {
     @ApiModelProperty("发票信息")
     private SysTopTenantInvoiceBo invoiceBo;
 
+    @ApiModelProperty("教务电话")
+    private String eduPhone;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysTopTenantEditBo.java

@@ -46,4 +46,7 @@ public class SysTopTenantEditBo {
     @ApiModelProperty("发票信息")
     private SysTopTenantInvoiceBo invoiceBo;
 
+    @ApiModelProperty("教务电话")
+    private String eduPhone;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -101,4 +101,7 @@ private static final long serialVersionUID=1L;
     /** 发票信息JSON */
     private String invoiceInformation;
 
+    /** 教务电话 */
+    private String eduPhone;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/vo/SysTenantVo.java

@@ -65,4 +65,7 @@ public class SysTenantVo {
 	@ApiModelProperty("发票信息")
 	private SysTopTenantInvoiceBo invoiceBo;
 
+	@ApiModelProperty("教务电话")
+	private String eduPhone;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserVisitLogServiceImpl.java

@@ -3,27 +3,28 @@ package com.zhongzheng.modules.user.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.user.bo.UserVisitLogAddBo;
 import com.zhongzheng.modules.user.bo.UserVisitLogEditBo;
 import com.zhongzheng.modules.user.bo.UserVisitLogQueryBo;
-import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserVisitLog;
 import com.zhongzheng.modules.user.mapper.UserVisitLogMapper;
 import com.zhongzheng.modules.user.service.IUserVisitLogService;
 import com.zhongzheng.modules.user.vo.UserVisitLogVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -294,6 +294,9 @@ public class UserVo {
 	@ApiModelProperty("密码最后修改时间")
 	private Long pwdTime;
 
+	@ApiModelProperty("教务电话")
+	private String eduPhone;
+
 	public void setNull(){
 		this.setOpenId(null);
 		this.setIdCardImg1(null);