fix

run-dev.sh

@@ -20,6 +20,8 @@ echo '----build image----'
 docker run -p 5055:5055 --name ${app_name} \
 --restart=always \
 --link mysql:db \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 --add-host=gdxypx.xy.com:192.168.1.210 \
@@ -59,6 +61,8 @@ docker run \
 --name ${app_admin_name} \
 --restart=always \
 --link mysql:db \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 --add-host=gdxypx.xy.com:192.168.1.210 \
@@ -99,12 +103,14 @@ docker run \
 --name ${app_admin_name} \
 --restart=always \
 --link mysql:db \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 --add-host=gdxypx.xy.com:192.168.1.210 \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/dev_admin:/logs \
+-v /data/logs/dev_admin_top:/logs \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -v /data/nginx/conf.d:/data/nginx/conf.d \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}

run-pre.sh

@@ -20,6 +20,8 @@ echo '----build image----'
 docker run -p 6055:5055 --name ${app_name} \
 --restart=always \
 --link mysql:db \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
@@ -62,6 +64,8 @@ docker run \
 --name ${app_admin_name} \
 --restart=always \
 --link mysql:db \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
@@ -73,5 +77,46 @@ docker run \
 echo '----start container admin----'
 
 
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
+
+#!/usr/bin/env bash
+# 定义应用组名
+group_admin_name='zhongzheng-pre'
+# 定义应用名称
+app_admin_name='zhongzheng-saas-admin-top-pre'
+# 定义应用版本
+app_admin_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='pre'
+echo '----copy jar admin----'
+docker stop ${app_admin_name}
+echo '----stop container admin----'
+docker rm ${app_admin_name}
+echo '----rm container admin----'
+docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----rm image admin----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
+echo '----build image admin----'
+docker run \
+-p 8077:7077 \
+--name ${app_admin_name} \
+--restart=always \
+--link mysql:db \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+--add-host=gdxypx.xy.com:192.168.1.210 \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/pre_admin_top:/logs \
+-v /mydata/app/${app_admin_name}/logs:/var/logs \
+-v /data/nginx/conf.d:/data/nginx/conf.d \
+-d ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----start container admin top----'
 
 

run-prod.sh

@@ -23,6 +23,8 @@ docker run -p 5055:5055 --name ${app_name} \
 -e TZ="Asia/Shanghai" \
 -m 10240m \
 --cpus=3 \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
 -v /data/logs/prod_api:/logs \
@@ -58,6 +60,8 @@ docker run \
 -p 5030:5030 \
 --name ${app_admin_name} \
 --restart=always \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
@@ -96,6 +100,8 @@ docker run \
 -p 7077:7077 \
 --name ${app_admin_name} \
 --restart=always \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/inform/TopInformSysUserController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.inform;
+
+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.model.TopLoginUser;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TopTokenService;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserQueryBo;
+import com.zhongzheng.modules.top.financial.service.ITopInformSysUserService;
+import com.zhongzheng.modules.top.financial.vo.TopInformSysUserVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 通知绑定系统用户Controller
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+@Api(value = "通知绑定系统用户控制器", tags = {"通知绑定系统用户管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/inform/sys_user")
+public class TopInformSysUserController extends BaseController {
+
+    private final ITopInformSysUserService iInformSysUserService;
+
+    private final TopTokenService tokenService;
+
+    /**
+     * 查询通知绑定系统用户列表
+     */
+    @ApiOperation("查询通知绑定系统用户列表")
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopInformSysUserVo> list(TopInformSysUserQueryBo bo) {
+        TopLoginUser TopLoginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(TopLoginUser.getUser().getUserId());
+        startPage();
+        List<TopInformSysUserVo> list = iInformSysUserService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取通知绑定系统用户详细信息
+     */
+    @ApiOperation("获取通知绑定教务用户未读消息数量")
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/informUnReadSum")
+    public AjaxResult<Integer> informUnReadSum() {
+        TopLoginUser TopLoginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        return AjaxResult.success(iInformSysUserService.informUnReadSum(TopLoginUser.getUser().getUserId()));
+    }
+
+
+
+    /**
+     * 获取通知绑定系统用户详细信息
+     */
+    @ApiOperation("获取通知绑定系统用户详细信息")
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<TopInformSysUserVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iInformSysUserService.queryById(id));
+    }
+
+    /**
+     * 新增通知绑定系统用户
+     */
+    @ApiOperation("新增通知绑定系统用户")
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "通知绑定系统用户", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopInformSysUserAddBo bo) {
+        return toAjax(iInformSysUserService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改通知绑定系统用户
+     */
+    @ApiOperation("修改通知绑定系统用户")
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "通知绑定系统用户", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody TopInformSysUserEditBo bo) {
+        return toAjax(iInformSysUserService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+    /**
+     * 修改通知绑定系统用户
+     */
+    @ApiOperation("批量修改通知绑定系统用户状态")
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "批量修改通知绑定系统用户状态", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateReadStatusBatch")
+    public AjaxResult<Void> updateReadStatusBatch(@RequestBody TopInformSysUserEditBo bo) {
+        return toAjax(iInformSysUserService.updateReadStatusBatch(bo) ? 1 : 0);
+    }
+
+}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderCheckLogController.java

@@ -97,4 +97,16 @@ public class TopOldOrderCheckLogController extends BaseController {
     }
 
 
+    @ApiOperation("批量修改订单分成审核记录")
+    @PreAuthorize("@ss.hasPermi('system:log:edit')")
+    @Log(title = "批量修改订单分成审核记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateBatchDivideByEditBo")
+    public AjaxResult<Void> updateBatchDivideByEditBo(@RequestBody List<TopOldOrderCheckLogEditBo> bo) {
+        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        for(TopOldOrderCheckLogEditBo editBo : bo){
+            editBo.setLoginId(loginUser.getUser().getUserId());
+            editBo.setLoginName(loginUser.getUser().getUserName());
+        }
+        return toAjax(iTopOldOrderCheckLogService.updateBatchDivideByEditBo(bo) ? 1 : 0);
+    }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderController.java

@@ -18,6 +18,7 @@ import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
 import com.zhongzheng.modules.top.goods.vo.TopOrderStatisticsVo;
 import com.zhongzheng.modules.top.goods.vo.TopRefundOrderDetailVo;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderCommissionExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderSellerExportVo;
@@ -155,6 +156,15 @@ public class TopOldOrderController extends BaseController {
         return util.exportExcel(list, "机构分成列表");
     }
 
+    @ApiOperation("佣金结算列表导出")
+    @PreAuthorize("@ss.hasPermi('system:tp:list')")
+    @GetMapping("/commissionListExport")
+    public AjaxResult<List<TopOldOrderSellerExportVo>> commissionListExport(TopDivideLogQueryBo bo) {
+        List<TopOldOrderCommissionExportVo> list = iTopOldOrderService.commissionListExport(bo);
+        ExcelUtil<TopOldOrderCommissionExportVo> util = new ExcelUtil<TopOldOrderCommissionExportVo>(TopOldOrderCommissionExportVo.class);
+        return util.exportExcel(list, "佣金结算列表");
+    }
+
     @ApiOperation("机构分成列表")
     @PreAuthorize("@ss.hasPermi('system:tp:list')")
     @GetMapping("/queryTenantList")

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SuperSysLoginController.java

@@ -12,6 +12,7 @@ import com.zhongzheng.framework.web.service.TopSysPermissionService;
 import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.top.user.domain.TopSysMenu;
 import com.zhongzheng.modules.top.user.service.ITopSysMenuService;
+import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
 import com.zhongzheng.modules.top.user.service.ITopSysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -54,6 +55,9 @@ public class SuperSysLoginController
 
     @Autowired
     private ITopSysUserService userService;
+
+    @Autowired
+    private ITopSysRoleService iTopSysRoleService;
     /**
      * 登录方法
      *
@@ -89,10 +93,12 @@ public class SuperSysLoginController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
+        List<Integer> rolesId = iTopSysRoleService.selectRoleListByUserId(user.getUserId());
         Map<String,Object> map = new HashMap<>();
         map.put("user", user);
         map.put("roles", roles);
         map.put("permissions", permissions);
+        map.put("rolesId", rolesId);
 
         return AjaxResult.success(map);
 

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SysProfileController.java

@@ -0,0 +1,144 @@
+package com.zhongzheng.controller.system;
+
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.config.RuoYiConfig;
+import com.zhongzheng.common.constant.UserConstants;
+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.entity.TopSysUser;
+import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.core.domain.model.TopLoginUser;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.ToolsUtils;
+import com.zhongzheng.common.utils.file.FileUploadUtils;
+import com.zhongzheng.framework.web.service.TokenService;
+import com.zhongzheng.framework.web.service.TopTokenService;
+import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.top.user.service.ITopSysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * 个人信息 业务处理
+ *
+ * @author zhongzheng
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController
+{
+    @Autowired
+    private ITopSysUserService userService;
+
+
+    @Autowired
+    private TopTokenService topTokenService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    public AjaxResult profile()
+    {
+        TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
+        TopSysUser user = loginUser.getUser();
+        AjaxResult ajax = AjaxResult.success(user);
+        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+        return ajax;
+    }
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult updateProfile(@RequestBody TopSysUser user)
+    {
+        if (StrUtil.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        if (StrUtil.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        if (userService.updateUserProfile(user) > 0)
+        {
+            TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
+            // 更新缓存用户信息
+            loginUser.getUser().setNickName(user.getNickName());
+            loginUser.getUser().setPhonenumber(user.getPhonenumber());
+            loginUser.getUser().setEmail(user.getEmail());
+            loginUser.getUser().setSex(user.getSex());
+            topTokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改个人信息异常，请联系管理员");
+    }
+
+    /**
+     * 重置密码
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    {
+        TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
+        String userName = loginUser.getUsername();
+        String password = loginUser.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return AjaxResult.error("修改密码失败，旧密码错误");
+        }
+        if(!ToolsUtils.verifPwd(newPassword)){
+            throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return AjaxResult.error("新密码不能与旧密码相同");
+        }
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        {
+            // 更新缓存用户密码
+            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+            topTokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改密码异常，请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     */
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping("/avatar")
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    {
+        if (!file.isEmpty())
+        {
+            TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
+            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+            {
+                AjaxResult ajax = AjaxResult.success();
+                ajax.put("imgUrl", avatar);
+                // 更新缓存用户头像
+                loginUser.getUser().setAvatar(avatar);
+                topTokenService.setLoginUser(loginUser);
+                return ajax;
+            }
+        }
+        return AjaxResult.error("上传图片异常，请联系管理员");
+    }
+}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SysTenantController.java

@@ -126,6 +126,25 @@ public class SysTenantController extends BaseController {
         return toAjax(iSysTenantService.editTopTenant(bo) ? 1 : 0);
     }
 
+    /**
+     * 删除机构
+     */
+    @ApiOperation("删除机构")
+    @PostMapping("/delete/top")
+    public AjaxResult<Void> deleteTopTenant(@RequestBody SysTopTenantEditBo bo) {
+        return toAjax(iSysTenantService.deleteTopTenant(bo) ? 1 : 0);
+    }
+
+    /**
+     * 查询系统商户列表
+     */
+    @ApiOperation("查询系统商户列表")
+    @GetMapping("/top/list")
+    public AjaxResult<List<SysTenantVo>> getTopListAll(SysTenantQueryBo bo) {
+        List<SysTenantVo> list = iSysTenantService.queryList(bo);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 删除系统商户
      */

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysRoleController.java

@@ -6,6 +6,7 @@ import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
@@ -14,7 +15,6 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TopSysPermissionService;
 import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
 import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
 import com.zhongzheng.modules.top.user.service.ITopSysUserService;
 import io.swagger.annotations.Api;
@@ -29,7 +29,7 @@ import java.util.List;
 
 /**
  * 角色信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-03-10
  */

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysUserController.java

@@ -8,6 +8,7 @@ import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.bo.SysUserEditBo;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
@@ -19,7 +20,6 @@ import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
 import com.zhongzheng.modules.top.user.service.ITopSysPostService;
 import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
 import com.zhongzheng.modules.top.user.service.ITopSysUserService;

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -166,3 +166,6 @@ oldOrder:
 
 oldSys:
     host: http://gdxypx.xy.com
+
+invoice:
+    host: http://192.168.1.222:7077/sys/common/openMplatform/log

zhongzheng-admin-saas/src/main/resources/application-pre.yml

@@ -4,9 +4,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
             username: root
-            password: gdxy2021!@#zzjykj
+            password: zhongzheng2021
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -49,11 +49,11 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 172.18.19.227
+        host: 192.168.1.222
         # 端口，默认为6379
         port: 6379
         # 数据库索引
-        database: 0
+        database: 1
         # 密码
         password: zhongzheng2021_redis
         # 连接超时时间
@@ -152,3 +152,20 @@ Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
+
+oldOrder:
+    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: http://192.168.1.222:6030/common/platform/pay
+    refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
+
+oldSys:
+    host: http://test.jqbao.net
+
+invoice:
+    host: http://192.168.1.222:8077/sys/common/openMplatform/log

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -258,7 +258,6 @@ public class ClassGradeController extends BaseController {
         List<UserPeriodExportV2Vo> list = iClassGradeUserService.listUserStudyRecordV2(bo);
         return getDataTable(list);
     }
-
     /**
      * 查询学时学员记录列表
      *//*

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

@@ -7,9 +7,11 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.modules.alisms.service.IAliSmsService;
 import com.zhongzheng.modules.user.bo.*;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.vo.UserIdCardBatchVo;
 import com.zhongzheng.modules.user.vo.UserStatstVo;
@@ -201,4 +203,10 @@ public class UserController extends BaseController {
     {
         return AjaxResult.success(iUserService.batchUserId(list));
     }
+
+    @ApiOperation("修改客户端用户密码")
+    @PostMapping("/updatePwd")
+    public AjaxResult<Void> updatePwd(@RequestBody UserAppUpdatePwdBo bo) {
+        return toAjax(iUserService.updatePwdByClient(bo)? 1 : 0);
+    }
 }

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -168,3 +168,6 @@ oldOrder:
 
 oldSys:
     host: http://gdxypx.xy.com
+
+invoice:
+    host: http://192.168.1.222:7077/sys/common/openMplatform/log

zhongzheng-admin/src/main/resources/application-pre.yml

@@ -4,9 +4,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
             username: root
-            password: gdxy2021!@#zzjykj
+            password: zhongzheng2021
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -152,3 +152,20 @@ Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
+
+oldOrder:
+    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: http://192.168.1.222:6030/common/platform/pay
+    refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
+
+oldSys:
+    host: http://test.jqbao.net
+
+invoice:
+    host: http://192.168.1.222:8077/sys/common/openMplatform/log

zhongzheng-admin/src/main/resources/application-prod.yml

@@ -154,4 +154,4 @@ Nuonuo:
     APPSecret: 07168A248B2844E0
 
 oldSys:
-    host: https://www.xyyxt.net
+    host: http://test.jqbao.net

zhongzheng-api/src/main/resources/application-dev.yml

@@ -169,3 +169,6 @@ oldOrder:
 
 oldSys:
     host: http://gdxypx.xy.com
+
+invoice:
+    host: http://192.168.1.222:7077/sys/common/openMplatform/log

zhongzheng-api/src/main/resources/application-pre.yml

@@ -4,9 +4,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
             username: root
-            password: gdxy2021!@#zzjykj
+            password: zhongzheng2021
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -152,3 +152,20 @@ Nuonuo:
     host: https://sandbox.nuonuocs.cn/open/v1/services
     APPkey: SD39149760
     APPSecret: SD168A248B2844E0
+
+oldOrder:
+    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: http://192.168.1.222:6030/common/platform/pay
+    refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
+
+oldSys:
+    host: http://test.jqbao.net
+
+invoice:
+    host: http://192.168.1.222:8077/sys/common/openMplatform/log

zhongzheng-api/src/main/resources/application-prod.yml

@@ -166,4 +166,4 @@ Nuonuo:
     APPSecret: 07168A248B2844E0
 
 oldSys:
-    host: https://www.xyyxt.net
+    host: http://test.jqbao.net

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/domain/TopSysRole.java → zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/TopSysRole.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.top.user.domain;
+package com.zhongzheng.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.zhongzheng.common.annotation.Excel;

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/TopSysUser.java

@@ -144,7 +144,7 @@ public class TopSysUser implements Serializable
 
     /** 角色对象 */
     @TableField(exist = false)
-    private List<SysRole> roles;
+    private List<TopSysRole> roles;
 
     /** 角色组 */
     @TableField(exist = false)

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/DateUtils.java

@@ -331,6 +331,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return "P"+getDateOrderSn();
     }
 
+    public static String getInvoiceOrderSn()
+    {
+        DateTimeFormatter ofPattern = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+        String localDate = (LocalDateTime.now().format(ofPattern)).substring(2);
+        //随机数
+        String randomNumeric = RandomStringUtils.randomNumeric(4);
+        return "IN"+localDate+randomNumeric;
+
+    }
+
     public static String getTagOrderSn(String tag)
     {
         return tag+getDateOrderSn();

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/TelPhoneUtils.java

@@ -4,6 +4,9 @@ import com.zhongzheng.common.utils.spring.SpringUtils;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 
+import java.io.IOException;
+import java.util.Random;
+
 /**
  * 手机号码工具栏
  *
@@ -11,6 +14,57 @@ import org.springframework.context.i18n.LocaleContextHolder;
  */
 public class TelPhoneUtils
 {
+    //中国移动
+    public static final String[] CHINA_MOBILE = {
+            "134", "135", "136", "137", "138", "139", "150", "151", "152", "157", "158", "159",
+            "182", "183", "184", "187", "188", "178", "147", "172", "198"
+    };
+    //中国联通
+    public static final String[] CHINA_UNICOM = {
+            "130", "131", "132", "145", "155", "156", "166", "171", "175", "176", "185", "186", "166"
+    };
+    //中国电信
+    public static final String[] CHINA_TELECOME = {
+            "133", "149", "153", "173", "177", "180", "181", "189", "199"
+    };
+
+    /**
+     * 生成手机号
+     */
+    public static String createMobile() {
+        StringBuilder sb = new StringBuilder();
+        Random random = new Random();
+        int op = random.nextInt(3);//随机运营商标志位
+        String mobileThree;//手机号前三位
+        int temp;
+        switch (op) {
+            case 0:
+                mobileThree = CHINA_MOBILE[random.nextInt(CHINA_MOBILE.length)];
+                break;
+            case 1:
+                mobileThree = CHINA_UNICOM[random.nextInt(CHINA_UNICOM.length)];
+                break;
+            case 2:
+                mobileThree = CHINA_TELECOME[random.nextInt(CHINA_TELECOME.length)];
+                break;
+            default:
+                mobileThree = "op标志位有误！";
+                break;
+        }
+        if (mobileThree.length() > 3) {
+            return mobileThree;
+        }
+        sb.append(mobileThree);
+        //生成手机号后8位
+        for (int i = 0; i < 8; i++) {
+            temp = random.nextInt(10);
+            sb.append(temp);
+        }
+        return sb.toString();
+    }
+
+
+
     /**
      * 隐藏手机号码
      * @param tel

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.common.utils;
 
+
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.google.zxing.common.BitMatrix;
@@ -12,9 +13,15 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
+
+
+import static org.apache.xmlbeans.impl.util.Base64.encode;
+
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+
 public class ToolsUtils {
 
     public static final int EMU_PER_PX = 9525;
@@ -262,6 +269,11 @@ public class ToolsUtils {
         return null;
     }
 
+    public static String encodetoStr(byte[] src) {
+        byte[] encoded = encode(src);
+        return new String(encoded,0,0,encoded.length);
+    }
+
     /**
      * 不够位数的在前面补0，保留num的长度位数字
      * @param code
@@ -341,6 +353,16 @@ public class ToolsUtils {
         return result;
     }
 
+    public static boolean verifEasyPwd(String passWord) {
+        if(Validator.isEmpty(passWord)){
+            return false;
+        }
+        if(passWord.length()<6||passWord.length()>18){
+            return false;
+        }
+        return true;
+    }
+
     public static boolean verifPwd(String passWord) {
         if(Validator.isEmpty(passWord)){
             return false;
@@ -445,4 +467,39 @@ public class ToolsUtils {
         return tmpImg ;
     }
 
+    public static String solve(String num) {
+        if (num == null) {
+            return null;
+        }
+        // 判断是否有小数
+        int index = num.indexOf(".");
+        if (index >= 0) {
+            String integer = num.substring(0, index);
+            String decimal = num.substring(index);
+            // 分隔后的整数+小数拼接起来
+            return addSeparator(integer) + decimal;
+        } else {
+            return addSeparator(num);
+        }
+    }
+
+    // 添加分隔符
+    public static String addSeparator(String num) {
+        int length = num.length();
+        ArrayList list = new ArrayList();
+        while (length > 3) {
+            list.add(num.substring(length - 3, length));
+            length = length - 3;
+        }
+        // 将前面小于三位的数字添加到ArrayList中
+        list.add(num.substring(0, length));
+        StringBuffer buffer = new StringBuffer();
+        // 倒序拼接
+        for (int i = list.size() - 1; i > 0; i--) {
+            buffer.append(list.get(i) + ",");
+        }
+        buffer.append(list.get(0));
+        return buffer.toString();
+    }
+
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/http/HttpUtils.java

@@ -166,7 +166,8 @@ public class HttpUtils
 
     public static String sendPostJsonHeader(String url, String json, Map<String, String> headersMap)
     {
-        HttpClient client =  HttpClients.createDefault();
+   //     System.out.println(json);
+        HttpClient client = HttpClients.createDefault();
         HttpPost post = new HttpPost(url);
         try {
             //此处应设定参数的编码格式，不然中文会变乱码

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -18,6 +19,8 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.order.domain.Order;
+import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.system.bo.*;
 import com.zhongzheng.modules.system.domain.SysRoleMenu;
 import com.zhongzheng.modules.system.domain.SysTenant;
@@ -27,8 +30,11 @@ import com.zhongzheng.modules.system.service.*;
 import com.zhongzheng.modules.system.vo.SysTenantAccountVo;
 import com.zhongzheng.modules.system.vo.SysTenantBankAccountVo;
 import com.zhongzheng.modules.system.vo.SysTenantVo;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
 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;
@@ -71,6 +77,15 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
 
+    @Autowired
+    @Lazy
+    private ITopOldOrderService topOldOrderService;
+
+    @Autowired
+    @Lazy
+    private IOrderService orderService;
+
+
     @Override
     public SysTenantVo queryById(Long tenantId){
         SysTenant db = this.baseMapper.selectById(tenantId);
@@ -80,8 +95,9 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     @Override
     public List<SysTenantVo> queryList(SysTenantQueryBo bo) {
         LambdaQueryWrapper<SysTenant> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getStatus() != null, SysTenant::getStatus, bo.getStatus());
+        lqw.ne(SysTenant::getStatus, -1);
         lqw.like(StrUtil.isNotBlank(bo.getTenantName()), SysTenant::getTenantName, bo.getTenantName());
+        lqw.eq(ObjectUtils.isNotNull(bo.getTenantid()),SysTenant::getTenantId, bo.getTenantid());
         return entity2Vo(this.list(lqw));
     }
 
@@ -429,6 +445,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         add.setTenantId(createTenantId());
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setStatus(1);
         if (ObjectUtils.isNotNull(bo.getAccountList())){
             add.setAccountInformation(JSONArray.toJSONString(bo.getAccountList()));
         }
@@ -448,6 +465,8 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 //        if(checkNameUnique(tenant)){
 //            throw new CustomException("公司名已存在");
 //        }
+        tenant.setHostH5(bo.getHostH5());
+        tenant.setHostPc(bo.getHostPc());
         tenant.setBillType(bo.getBillType());
         tenant.setBillDay(bo.getBillDay());
         tenant.setAccountInformation(JSONArray.toJSONString(bo.getAccountList()));
@@ -455,6 +474,23 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         return updateById(tenant);
     }
 
+    @Override
+    public boolean deleteTopTenant(SysTopTenantEditBo bo) {
+        if (CollectionUtils.isEmpty(bo.getTenantIds())){
+            throw new CustomException("参数错误");
+        }
+        for (Long tenantId : bo.getTenantIds()) {
+            int count = topOldOrderService.count(new LambdaQueryWrapper<TopOldOrder>().eq(TopOldOrder::getTenantId, tenantId));
+            int num = orderService.count(new LambdaQueryWrapper<Order>().eq(Order::getTenantId, tenantId));
+            if (count > 0 || num > 0){
+                throw new CustomException("机构已有订单信息，请勿删除！");
+            }
+        }
+        return update(new LambdaUpdateWrapper<SysTenant>()
+        .in(SysTenant::getTenantId,bo.getTenantIds())
+        .set(SysTenant::getStatus,-1));
+    }
+
     private void initRoles(Long newTenantId,Long tenantId) {
         List<String> roleKey = new ArrayList<>();
         roleKey.add("seller");

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

@@ -35,6 +35,7 @@ import com.zhongzheng.modules.course.service.ICourseSubjectService;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
+import com.zhongzheng.modules.inform.domain.InformRemind;
 import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.top.mall.domain.TopStore;
 import com.zhongzheng.modules.top.mall.service.ITopStoreService;
@@ -190,6 +191,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             List<ClassGradeUserGoodsVo> classGradeUserGoodsVos = iClassGradeUserService.listUser(classGradeUserQueryBo);
             userVo.setClassGradeUserGoodsVoList(classGradeUserGoodsVos);
             userVo.setOrderNum(userVo.getGoodsCourseNum());
+
+            UserVisitLog userVisitLog = iUserVisitLogService.getOne(new LambdaQueryWrapper<UserVisitLog>().eq(UserVisitLog::getUserId, userVo.getUserId()).orderByDesc(UserVisitLog::getId).last("limit 1"));
+            if(Validator.isNotEmpty(userVisitLog)){
+                userVo.setLastVisitTime(userVisitLog.getCreateTime());
+                userVo.setVisitFromPlat(Integer.parseInt(userVisitLog.getFromPlat()));
+            }
+
+            UserStudyLog userStudyLog = iUserStudyLogService.getOne(new LambdaQueryWrapper<UserStudyLog>().eq(UserStudyLog::getUserId, userVo.getUserId()).orderByDesc(UserStudyLog::getId).last("limit 1"));
+            if(Validator.isNotEmpty(userStudyLog)){
+                userVo.setLastStudyTime(userStudyLog.getCreateTime());
+                userVo.setStudyFromPlat(Integer.parseInt(userStudyLog.getFromPlat()));
+            }
         }
         return list;
     }
@@ -892,6 +905,26 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return true;
     }
 
+    @Override
+    public Boolean updatePwdByClient(UserAppUpdatePwdBo bo) {
+        User user = getOne(new LambdaQueryWrapper<User>().eq(User::getUserId, bo.getUserId()));
+        if(Validator.isEmpty(user)){
+            throw new BaseException("用户信息错误");
+        }
+        if (Validator.isEmpty(bo.getNewPwd()))
+        {
+            throw new BaseException("新密码格式错误");
+        }
+        if(!ToolsUtils.verifEasyPwd(bo.getNewPwd())){
+            throw new CustomException("密码应由6-18位组成");
+        }
+        user.setPassword(SecurityUtils.encryptPassword(bo.getNewPwd()));
+        user.setPwdTime(DateUtils.getNowTime());
+        user.setUpdateTime(DateUtils.getNowTime());
+        updateById(user);
+        return true;
+    }
+
     @Override
     public List<UserIdCardBatchVo> batchUserId(List<UserIdCardAddBo> list) {
         List<UserIdCardBatchVo> list1 = new ArrayList<>();
@@ -915,8 +948,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             }
             User user1 = getOne(new LambdaQueryWrapper<User>()
                     .eq(User::getTelphone,EncryptHandler.encrypt(bo.getTelphone())).last("limit 1"));
-            //手机号码存在
-            if(Validator.isNotEmpty(user1)){
+            //手机号码存在 身份证一致
+            if(Validator.isNotEmpty(user1) &&
+                    Validator.isNotEmpty(bo.getIdCard())&&Validator.isNotEmpty(user1.getIdCard())
+                    && EncryptHandler.decrypt(user1.getIdCard()).equals(bo.getIdCard())
+            ){
                 UserIdCardBatchVo user = BeanUtil.toBean(bo, UserIdCardBatchVo.class);
 //                if(Validator.isNotEmpty(bo.getIdCard())&&Validator.isNotEmpty(user1.getIdCard())&&!user1.getIdCard().equals(bo.getIdCard())){
 //                    throw new CustomException(bo.getRealname()+"身份证号码不一致");
@@ -942,7 +978,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                     }
                 }*/
                 UserSystemRegisterBo registerBo = BeanUtil.toBean(bo, UserSystemRegisterBo.class);
-                registerBo.setTel(bo.getTelphone());
+                if (Validator.isNotEmpty(user1)){
+                    //手机号码存在，身份证不一致 (随机生成)
+                    registerBo.setTel(createTel());
+                }else {
+                    registerBo.setTel(bo.getTelphone());
+                }
                 registerBo.setIdcard(bo.getIdCard());
                 registerBo.setRegisterPlat("4");
                 Long userId = systemRegisterUser(registerBo);
@@ -958,6 +999,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return list1;
     }
 
+    private String createTel() {
+        String mobile = TelPhoneUtils.createMobile();
+        int count = count(new LambdaQueryWrapper<User>()
+                .eq(User::getTelphone, EncryptHandler.encrypt(mobile)));
+        if (count > 0){
+            createTel();
+        }
+        return mobile;
+    }
+
+
     @Override
     public boolean editShareActivityCode(UserEditBo bo) {
         if (ObjectUtils.isNotNull(bo.getShareActivityCode())){

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserChapterSectionVo.java

@@ -98,7 +98,7 @@ public class CourseUserChapterSectionVo {
 	@ApiModelProperty("直播结束时间")
 	private Long liveEndTime;
 
-	@ApiModelProperty("1已学习")
+	@ApiModelProperty("1已学完")
 	private Long learning;
 
 	@ApiModelProperty("1审核已通过")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -862,6 +862,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                             throw new CustomException(studyAccountStatusQueryBo.getRealname() + "学员信息为空");
                         }
                         CertInfoListItem certInfoListItem = new CertInfoListItem();
+                        if(Validator.isEmpty(personRoot.getCertInfoList())||personRoot.getCertInfoList().size()==0){
+                            throw new CustomException(studyAccountStatusQueryBo.getRealname() + "学员信息为空");
+                        }
                         for (CertInfoListItem certInfo : personRoot.getCertInfoList()) {
                             if (studyAccountStatusQueryBo.getWorkTypeName().equals(certInfo.getWorkTypeName())) {
                                 BeanUtils.copyProperties(certInfo, certInfoListItem);

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -563,6 +563,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         }else{
             bmrq = userVo.getClassStartTime();
         }
+        if(Validator.isEmpty(userVo.getRealName())||Validator.isEmpty(userVo.getIdCard())||Validator.isEmpty(userVo.getTelPhone())){
+            throw new CustomException("用户信息缺失");
+        }
         Map<String, String> params = new HashMap<>();
         params.put("zh", OFFICIALPUSH_INFOACCOUNT);
         params.put("bh", userVo.getOfficialName());

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -556,6 +556,8 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             if(Validator.isNotEmpty(business7)&&"七大员".equals(business7.getBusinessName())){
                 hasSeven = true;
                 studyRec.setCourseType(17);
+                //去掉七大员推送
+                return true;
             }
         }
         UserVo userVo = iUserService.queryById(bo.getUserId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceBo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年05月23日 13:56
+ */
+@Data
+public class OrderInvoiceBo implements Serializable {
+
+    private String buyerName;
+
+    private String buyerTaxNum;
+
+    private String naturalPersonFlag;
+
+    private String orderNo;
+
+    private String invoiceDate;
+
+    private String salerTaxNum = "524400003364615059";
+
+    private String clerk = "吴建英";
+
+    private Integer pushMode = 0;
+
+    private String email;
+
+    private Integer invoiceType = 1;
+
+    private String invoiceLine;
+
+    private String SalerTel = "020-87085982";
+
+    private String SalerAddress = "广东省广州市天河区燕岭路123号3楼";
+
+    private OrderInvoiceDetailBo invoiceDetail;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceDetailBo.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.order.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author yangdamao
+ * @date 2023年05月23日 13:56
+ */
+@Data
+public class OrderInvoiceDetailBo implements Serializable {
+
+    private String goodsName = "培训费";
+
+    private String withTaxFlag = "1";
+
+    private BigDecimal price;
+
+    private Integer num = 1;
+
+    private String unit = "项";
+
+    private String taxRate = "0.03";
+
+    private String dField1 = "";
+
+    private String dField2 = "";
+
+    private String dField3 = "";
+
+    private String dField4 = "";
+
+    private String dField5 = "";
+
+    private String goodsCode = "307020102";
+
+    private String favouredPolicyFlag = "01";
+
+    private String favouredPolicyName = "简易征收";
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceHostBo.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.order.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年05月23日 13:56
+ */
+@Data
+public class OrderInvoiceHostBo implements Serializable {
+
+    private OrderInvoiceBo order;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInvoice.java

@@ -86,4 +86,6 @@ private static final long serialVersionUID=1L;
     private String invoiceNum;
     /** 审核时间 */
     private Long periodTime;
+    /** 流水号 */
+    private String serialNumber;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -446,6 +446,8 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
         update.setWxpayRefundId(WxpayRefundId);
         update.setRefundTime(DateUtils.getNowTime());
         update.setPeriodStatus(3);//已完成
+        update.setDivideModel(orderGoods.getDivideModel());
+        update.setDivideMoney(orderGoods.getDivideMoney());
         this.updateById(update);
         //修改订单商品退款状态
         orderGoods.setRefundStatus(2); //已退款
@@ -819,7 +821,13 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
                 throw new CustomException("退款错误"+ JSON.toJSONString(payResult));
             }
         });
-        return true;
+        String orderSn = refundBos.get(0).getOrderSn();
+        Order order = iOrderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, orderSn));
+        //实际账款 = 已收 - 已退
+        BigDecimal subtract = order.getOrderReceived().subtract(order.getOrderRefunded());
+        BigDecimal profitTotal = subtract.subtract(order.getOrderCost());
+        order.setOrderProfit(profitTotal);
+        return iOrderService.updateById(order);
     }
 
     @Override
@@ -837,7 +845,13 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             //关闭C端用户的分销返利
             shareClientCancelOldSys(order,orderGoods,bo.getGoodsRealPrice());
         });
-        return true;
+        String orderSn = orderGoodsVos.get(0).getOrderSn();
+        Order order = iOrderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, orderSn));
+        //实际账款 = 已收 - 已退
+        BigDecimal subtract = order.getOrderReceived().subtract(order.getOrderRefunded());
+        BigDecimal profitTotal = subtract.subtract(order.getOrderCost());
+        order.setOrderProfit(profitTotal);
+        return iOrderService.updateById(order);
     }
 
 //    public Boolean topOrderRefund(){

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -3,21 +3,30 @@ package com.zhongzheng.modules.order.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.ToolsUtils;
+import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.course.bo.CourseChapterBusinessAddBo;
 import com.zhongzheng.modules.course.mapper.CourseChapterMapper;
-import com.zhongzheng.modules.order.bo.OrderInvoiceAddBo;
-import com.zhongzheng.modules.order.bo.OrderInvoiceEditBo;
-import com.zhongzheng.modules.order.bo.OrderInvoiceOrderAddBo;
-import com.zhongzheng.modules.order.bo.OrderInvoiceQueryBo;
+import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.OrderInvoice;
 import com.zhongzheng.modules.order.mapper.OrderInvoiceMapper;
 import com.zhongzheng.modules.order.service.IOrderInvoiceOrderService;
 import com.zhongzheng.modules.order.service.IOrderInvoiceService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
+import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.user.domain.User;
+import com.zhongzheng.modules.user.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -25,9 +34,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.io.IOException;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -42,6 +50,12 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
     @Autowired
     private IOrderInvoiceOrderService iOrderInvoiceOrderService;
 
+    @Autowired
+    private IUserService userService;
+
+    @Value("${invoice.host}")
+    private String INVOICE_PATH;
+
     @Override
     public OrderInvoiceVo queryById(Long invoiceId){
         OrderInvoice db = this.baseMapper.selectById(invoiceId);
@@ -128,6 +142,63 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
                 iOrderInvoiceOrderService.insertByAddBo(item);
             }
         }
+
+        //开发票
+        OrderInvoiceBo invoiceBo = new OrderInvoiceBo();
+        Long nowTime = DateUtils.getNowTime();
+        String sign = ToolsUtils.EncoderByMd5( nowTime.toString() + "pubilc2022");
+        //流水号
+        String invoiceOrderSn = DateUtils.getInvoiceOrderSn();
+        invoiceBo.setOrderNo(invoiceOrderSn);
+        invoiceBo.setInvoiceDate(DateUtils.timestampToDateFormat(DateUtils.getNowTime(),"yyyy-MM-dd HH:mm:ss"));
+        if (bo.getSubject() == 1){
+            //个人
+            invoiceBo.setBuyerName(bo.getInvoiceTitle());
+            invoiceBo.setNaturalPersonFlag("1");
+            if (ObjectUtils.isNotNull(bo.getUserId())){
+                User user = userService.getById(bo.getUserId());
+                invoiceBo.setBuyerTaxNum(EncryptHandler.decrypt(user.getIdCard()));
+            }
+        }else {
+            //企业
+            invoiceBo.setBuyerName(bo.getInvoiceTitle());
+            invoiceBo.setNaturalPersonFlag("0");
+            invoiceBo.setBuyerTaxNum(bo.getTaxRegistryNumber());
+        }
+        invoiceBo.setEmail(bo.getEmail());
+        if (bo.getType() == 1){
+            //1普通发票
+            invoiceBo.setInvoiceLine("pc");
+        }else {
+            //增值税专用发票
+            invoiceBo.setInvoiceLine("bs");
+        }
+        OrderInvoiceDetailBo detailBo = new OrderInvoiceDetailBo();
+        detailBo.setPrice(bo.getAmount());
+        invoiceBo.setInvoiceDetail(detailBo);
+        OrderInvoiceHostBo hostBo = new OrderInvoiceHostBo();
+        hostBo.setOrder(invoiceBo);
+        Map<String, String> params = new HashMap<>();
+        params.put("stamp", nowTime.toString());
+        params.put("sign", sign);
+        params.put("content", JSONObject.toJSONString(hostBo));
+        params.put("orderNo", invoiceOrderSn);
+        params.put("tenantId", ServletUtils.getRequest().getHeader("TenantId"));
+        String respone = "";
+        try {
+            respone = HttpUtils.sendPost(INVOICE_PATH, JSONObject.parseObject(JSONObject.toJSONString(params)));
+            if (!respone.contains("\"code\":200")) {
+                throw new CustomException("开发票接口请求错误");
+            }
+            OrderInvoice invoice = getById(add.getInvoiceId());
+            invoice.setPeriodStatus(3);
+            invoice.setInvoiceStatus(3);//开票中
+            invoice.setSerialNumber(invoiceOrderSn);
+            updateById(invoice);
+        } catch (Exception e) {
+            log.error("开发票接口请求错误" + respone);
+            throw new CustomException("开发票接口请求错误");
+        }
         return rs;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.order.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -986,6 +987,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //后台录单
             add.setOrderUncollected(BigDecimal.ZERO);
             add.setOrderReceived(add.getPayPrice());
+            add.setAccomplishTime(DateUtils.getNowTime());
         }else {
             add.setOrderUncollected(add.getPayPrice());
             add.setOrderReceived(BigDecimal.ZERO);
@@ -1007,6 +1009,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             List<OrderGoods> orderGoodsList = iOrderGoodsService
                     .list(new LambdaQueryWrapper<OrderGoods>()
                             .eq(OrderGoods::getOrderSn, add.getOrderSn())
+                            .ne(OrderGoods::getRefundStatus,2)
                             .eq(OrderGoods::getStatus, 1));
             TopCostTpVo topCostTpVo = BeanUtil.toBean(costTp, TopCostTpVo.class);
             //成本项
@@ -1025,9 +1028,27 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 //根据订单金额匹配成本阶梯
                 List<TopCostTpItem> tpItems = new ArrayList<>();
                 for (TopCostTpItem x : items) {
+                    BigDecimal price = goodsPrice;
+                    if (ObjectUtil.isNotNull(x.getDockStatus()) && x.getDockStatus() == 1){
+                        //启用成本扣除项
+                        switch (x.getDockType()){
+                            case 1://百分比
+                                //成本扣除金额
+                                BigDecimal divide1 = x.getDockValue().divide(new BigDecimal("100"));
+                                BigDecimal multiply = goodsPrice.multiply(divide1);
+                                price = price.subtract(multiply);
+                                break;
+                            case 2://固定金额
+                                price = price.subtract(x.getDockValue());
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
                     if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
-                            || (goodsPrice.compareTo(x.getMinValue()) > 0 && goodsPrice.compareTo(x.getMaxValue()) < 0)
-                            || (goodsPrice.compareTo(x.getMinValue()) == 0 && goodsPrice.compareTo(x.getMaxValue()) == 0)){
+                            || (price.compareTo(x.getMinValue()) > 0 && price.compareTo(x.getMaxValue()) < 0)
+                            || (price.compareTo(x.getMinValue()) == 0 && price.compareTo(x.getMaxValue()) == 0)){
                         tpItems.add(x);
                     }
                 }
@@ -1035,51 +1056,55 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     //匹配不到成本项阶梯值
                     continue;
                 }
-                if (tpItems.size() > 1) {
-                    //匹配到多个成本项
-                    throw new CustomException(String.format("成本项阶梯匹配有误！（有多个）请检查【%s,价格:%s】", businessName, goodsPrice.toString()));
-                }
-                //换算订单成本和盈亏
-                TopCostTpItem topCostTpItem = tpItems.stream().findFirst().get();
-                BigDecimal cost = new BigDecimal("0.00");//成本
+//                if (tpItems.size() > 1) {
+//                    //匹配到多个成本项
+//                    throw new CustomException(String.format("成本项阶梯匹配有误！（有多个）请检查【%s,价格:%s】", businessName, goodsPrice.toString()));
+//                }
                 BigDecimal divideMoney = new BigDecimal("0.00");//分成
+                BigDecimal cost = new BigDecimal("0.00");//成本
                 BigDecimal bigDecimal = new BigDecimal("100");
-                if (topCostTpItem.getDockStatus() == 1){
-                    //启用成本扣除项
-                    switch (topCostTpItem.getDockType()){
+                for (TopCostTpItem tpItem : tpItems) {
+                    BigDecimal goodsDecimal = goodsPrice;
+                    //换算订单成本和盈亏
+                    TopCostTpItem topCostTpItem = tpItem;
+                    if (ObjectUtil.isNotNull(topCostTpItem.getDockStatus()) && topCostTpItem.getDockStatus() == 1){
+                        //启用成本扣除项
+                        switch (topCostTpItem.getDockType()){
+                            case 1://百分比
+                                //成本扣除金额
+                                BigDecimal divide1 = topCostTpItem.getDockValue().divide(bigDecimal);
+                                BigDecimal multiply = goodsDecimal.multiply(divide1);
+                                goodsDecimal = goodsDecimal.subtract(multiply);
+                                break;
+                            case 2://固定金额
+                                goodsDecimal = goodsDecimal.subtract(topCostTpItem.getDockValue());
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    switch (topCostTpItem.getItemType()) {
                         case 1://百分比
-                            //成本扣除金额
-                            BigDecimal divide = topCostTpItem.getDockValue().divide(bigDecimal);
-                            BigDecimal multiply = goodsPrice.multiply(divide);
-                            goodsPrice = goodsPrice.subtract(multiply);
+                            BigDecimal divide = topCostTpItem.getTypeValue().divide(bigDecimal);
+                            BigDecimal multiply = goodsDecimal.multiply(divide);
+                            cost = cost.add(multiply);
+                            if (topCostTpItem.getItemCategory() == 1 && add.getFinishStatus() == 1){
+                                //订单已完单 并且是分成成本
+                                divideMoney = divideMoney.add(multiply);
+                            }
                             break;
                         case 2://固定金额
-                            goodsPrice = goodsPrice.subtract(topCostTpItem.getDockValue());
+                            cost = cost.add(topCostTpItem.getTypeValue());
+                            if (topCostTpItem.getItemCategory() == 1 && add.getFinishStatus() == 1){
+                                //分成
+                                divideMoney = divideMoney.add(topCostTpItem.getTypeValue());
+                            }
                             break;
                         default:
                             break;
                     }
-
-                }
-                switch (topCostTpItem.getItemType()) {
-                    case 1://百分比
-                        BigDecimal divide = topCostTpItem.getTypeValue().divide(bigDecimal);
-                        cost = goodsPrice.multiply(divide);
-                        if (topCostTpItem.getItemCategory() == 1 && add.getFinishStatus() == 1){
-                            //订单已完单 并且是分成成本
-                            divideMoney = goodsPrice.multiply(divide);
-                        }
-                        break;
-                    case 2://固定金额
-                        cost = topCostTpItem.getTypeValue();
-                        if (topCostTpItem.getItemCategory() == 1 && add.getFinishStatus() == 1){
-                            //分成
-                            divideMoney = topCostTpItem.getTypeValue();
-                        }
-                        break;
-                    default:
-                        break;
                 }
+
                 if (add.getFinishStatus() == 1 && divideTotal.compareTo(BigDecimal.ZERO) >0 ){
                     orderGoods.setDivideModel(divideModel);
                     orderGoods.setDivideMoney(divideMoney);
@@ -1088,7 +1113,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 costTotal = costTotal.add(cost);
                 divideTotal = divideTotal.add(divideMoney);
             }
-            profitTotal = add.getOrderPrice().subtract(costTotal);
             List<TopCostTpItem> costTpItemList = topCostTpItemService
                     .list(new LambdaQueryWrapper<TopCostTpItem>()
                             .eq(TopCostTpItem::getTpId, costTp.getTpId())
@@ -1097,13 +1121,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 List<TopCostTpItemVo> itemVoList = costTpItemList.stream().map(x -> BeanUtil.toBean(x, TopCostTpItemVo.class)).collect(Collectors.toList());
                 topCostTpVo.setItemList(itemVoList);
             }
+            //实际账款 = 已收 - 已退
+            BigDecimal subtract = add.getOrderReceived().subtract(add.getOrderRefunded());
+            profitTotal = subtract.subtract(costTotal);
             add.setOrderCost(costTotal);
             add.setOrderProfit(profitTotal);
             add.setCostJson(JSONObject.toJSONString(topCostTpVo));
             if (add.getFinishStatus() == 1 && divideTotal.compareTo(BigDecimal.ZERO) >0){
                 add.setDivideModel(divideModel);
                 add.setDivideStatus(2);//待审核
-                add.setCancelTime(DateUtils.getNowTime());
+                add.setAccomplishTime(DateUtils.getNowTime());
                 if (divideModel == 1) {
                     //机构分成
                     add.setDivideCompanyMoney(divideTotal);

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -414,9 +414,11 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     GoodsVo goodsVo1 = iGoodsService.queryById(goodsVo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：已为您开通了" + goodsVo1.getGoodsName() + "课程，本课程需完善信息方可学习，请尽快去完善资料吧。");
-                    goodsVo.setContext("尊敬的用户：已为您开通了" + goodsVo1.getGoodsName() + "课程，本课程需完善信息方可学习，请尽快去完善资料吧。");
-                    goodsVo.setGoodsName(goodsVo1.getGoodsName());
-                    voList.add(goodsVo);
+                    if (voList.stream().allMatch(x -> !x.getGoodsId().equals(goodsVo.getGoodsId()))){
+                        goodsVo.setContext("尊敬的用户：您购买的" + goodsVo1.getGoodsName() + "已经开通，请尽快去学习吧。");
+                        goodsVo.setGoodsName(goodsVo1.getGoodsName());
+                        voList.add(goodsVo);
+                    }
                     iInformUserService.insertByAddBo(informUserAddBo);
                 }
             }
@@ -1313,7 +1315,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         if(configBo.getYearType()==1){
                             TopDivideOrderQueryBo orderQueryBo1 = new TopDivideOrderQueryBo();
                             orderQueryBo1.setTenantId(tenantVo.getTenantId());
-                            orderQueryBo1.setBuyStartTime(year1);
+                            orderQueryBo1.setBuyEndTime(year1);
                             BigDecimal price1 = iTopDivideOrderService.getMonthBadSum(orderQueryBo1);
                             BigDecimal value1 = price1.divide(new BigDecimal(100)).multiply(new BigDecimal(configBo.getDetainRate()));
                             badPrice = badPrice.add(value1);
@@ -1321,8 +1323,8 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         else if(configBo.getYearType()==2){
                             TopDivideOrderQueryBo orderQueryBo2 = new TopDivideOrderQueryBo();
                             orderQueryBo2.setTenantId(tenantVo.getTenantId());
-                            orderQueryBo2.setBuyStartTime(year1);
-                            orderQueryBo2.setBuyEndTime(year2);
+                            orderQueryBo2.setBuyEndTime(year1);
+                            orderQueryBo2.setBuyStartTime(year2);
                             BigDecimal price2 = iTopDivideOrderService.getMonthBadSum(orderQueryBo2);
                             BigDecimal value2 = price2.divide(new BigDecimal(100)).multiply(new BigDecimal(configBo.getDetainRate()));
                             badPrice = badPrice.add(value2);
@@ -1330,8 +1332,8 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         else if(configBo.getYearType()==3){
                             TopDivideOrderQueryBo orderQueryBo3 = new TopDivideOrderQueryBo();
                             orderQueryBo3.setTenantId(tenantVo.getTenantId());
-                            orderQueryBo3.setBuyStartTime(year2);
-                            orderQueryBo3.setBuyEndTime(year3);
+                            orderQueryBo3.setBuyEndTime(year2);
+                            orderQueryBo3.setBuyStartTime(year3);
                             BigDecimal price3 = iTopDivideOrderService.getMonthBadSum(orderQueryBo3);
                             BigDecimal value3 = price3.divide(new BigDecimal(100)).multiply(new BigDecimal(configBo.getDetainRate()));
                             badPrice = badPrice.add(value3);
@@ -1339,8 +1341,8 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         else if(configBo.getYearType()==4){
                             TopDivideOrderQueryBo orderQueryBo4 = new TopDivideOrderQueryBo();
                             orderQueryBo4.setTenantId(tenantVo.getTenantId());
-                            orderQueryBo4.setBuyStartTime(year3);
-                            orderQueryBo4.setBuyEndTime(year4);
+                            orderQueryBo4.setBuyEndTime(year3);
+                            orderQueryBo4.setBuyStartTime(year4);
                             BigDecimal price4 = iTopDivideOrderService.getMonthBadSum(orderQueryBo4);
                             BigDecimal value4 = price4.divide(new BigDecimal(100)).multiply(new BigDecimal(configBo.getDetainRate()));
                             badPrice = badPrice.add(value4);
@@ -1348,8 +1350,8 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         else if(configBo.getYearType()==5){
                             TopDivideOrderQueryBo orderQueryBo5 = new TopDivideOrderQueryBo();
                             orderQueryBo5.setTenantId(tenantVo.getTenantId());
-                            orderQueryBo5.setBuyStartTime(year4);
-                            orderQueryBo5.setBuyEndTime(year5);
+                            orderQueryBo5.setBuyEndTime(year4);
+                            orderQueryBo5.setBuyStartTime(year5);
                             BigDecimal price5 = iTopDivideOrderService.getMonthBadSum(orderQueryBo5);
                             BigDecimal value5 = price5.divide(new BigDecimal(100)).multiply(new BigDecimal(configBo.getDetainRate()));
                             badPrice.add(value5);
@@ -1357,7 +1359,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         else if(configBo.getYearType()==6){
                             TopDivideOrderQueryBo orderQueryBo6 = new TopDivideOrderQueryBo();
                             orderQueryBo6.setTenantId(tenantVo.getTenantId());
-                            orderQueryBo6.setBuyStartTime(year5);
+                            orderQueryBo6.setBuyEndTime(year5);
                             BigDecimal price6 = iTopDivideOrderService.getMonthBadSum(orderQueryBo6);
                             BigDecimal value6 = price6.divide(new BigDecimal(100)).multiply(new BigDecimal(configBo.getDetainRate()));
                             badPrice = badPrice.add(value6);
@@ -1375,13 +1377,13 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     }
                     else if(badPrice.compareTo(lastBadPrice) == -1){
                         //小于
-                        BigDecimal diffBad = lastBadPrice.multiply(badPrice);
+                        BigDecimal diffBad = lastBadPrice.subtract(badPrice);
                         divideLog.setPayMoney(divideLog.getPayMoney().add(diffBad));
                         divideLog.setRealBadMoney(badPrice);
                     }
                     else if(badPrice.compareTo(lastBadPrice) == 1){
                         //大于
-                        BigDecimal diffBad = badPrice.multiply(lastBadPrice);
+                        BigDecimal diffBad = badPrice.subtract(lastBadPrice);
                         if(divideLog.getPayMoney().compareTo(diffBad) == 0){
                             divideLog.setPayMoney(new BigDecimal(0));
                             divideLog.setRealBadMoney(badPrice);
@@ -1393,7 +1395,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         }
                         if(divideLog.getPayMoney().compareTo(diffBad) == 1){
                             //大于
-                            divideLog.setPayMoney(divideLog.getPayMoney().multiply(diffBad));
+                            divideLog.setPayMoney(divideLog.getPayMoney().subtract(diffBad));
                             divideLog.setRealBadMoney(badPrice);
                         }
                     }
@@ -1445,6 +1447,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             TopDivideLog divideLog = new TopDivideLog();
             divideLog.setCreateNo(createNo.getCreateNo());
             divideLog.setCreateUsername(createNo.getCreateUsername());
+            divideLog.setTenantId(createNo.getTenantId().toString());
             divideLog.setDivideType(2);
             divideLog.setPayStatus(2);
             divideLog.setMonthTime(cal1.getTimeInMillis()/1000);
@@ -1465,7 +1468,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             }
             //获取上个账单
             LambdaQueryWrapper<TopDivideLog> lqw = Wrappers.lambdaQuery();
-            TopDivideLog divideLogLast = iTopDivideLogService.getOne(lqw.eq(TopDivideLog::getCreateNo,createNo.getCreateNo()).eq(TopDivideLog::getDivideType,2).orderByDesc(TopDivideLog::getId).last("limit 1"));
+            TopDivideLog divideLogLast = iTopDivideLogService.getOne(lqw.eq(TopDivideLog::getCreateNo,createNo.getCreateNo()).eq(TopDivideLog::getTenantId,createNo.getTenantId()).eq(TopDivideLog::getDivideType,2).orderByDesc(TopDivideLog::getId).last("limit 1"));
             divideLog.setDeductMoney(new BigDecimal(0));
             if(Validator.isNotEmpty(divideLogLast)){
                 //上个月流入未扣金额
@@ -1483,7 +1486,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 BigDecimal totalPayMoney = new BigDecimal(0);
                 List<TopDivideOrderVo> list1 = iTopDivideOrderService.getMonthFinishList(queryBo1);
                 for(TopDivideOrderVo vo : list1){
-                    totalPayMoney = totalPayMoney.add(vo.getDivideCompanyMoney());
+                    totalPayMoney = totalPayMoney.add(vo.getDivideSellerMoney());
                     TopDivideOrderAddBo addBo = new TopDivideOrderAddBo();
                     addBo.setDivideLogId(divideLog.getId());
                     addBo.setOrderSn(vo.getOrderSn());
@@ -1586,7 +1589,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 queryBo1.setTenantId(tenantVo.getTenantId());
                 //订单总待付分成
                 BigDecimal totalPayMoney = new BigDecimal(0);
-                List<TopDivideOrderVo> list1 = iTopDivideOrderService.getMonthFinishList(queryBo1);
+                List<TopDivideOrderVo> list1 = iTopDivideOrderService.getMonthCreditList(queryBo1);
                 for(TopDivideOrderVo vo : list1){
                     totalPayMoney = totalPayMoney.add(vo.getBrokerage());
                     TopDivideOrderAddBo addBo = new TopDivideOrderAddBo();

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/service/impl/TopNuoMplatformLogServiceImpl.java

@@ -14,6 +14,8 @@ import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.impl.UserPeriodServiceImpl;
 import com.zhongzheng.modules.order.domain.OrderGoodsRefund;
+import com.zhongzheng.modules.order.domain.OrderInvoice;
+import com.zhongzheng.modules.order.service.IOrderInvoiceOrderService;
 import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogAddBo;
 import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogEditBo;
 import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogQueryBo;
@@ -22,6 +24,7 @@ import com.zhongzheng.modules.sdk.mapper.TopNuoMplatformLogMapper;
 import com.zhongzheng.modules.sdk.service.ITopNuoMplatformLogService;
 import com.zhongzheng.modules.sdk.service.NuonuoService;
 import com.zhongzheng.modules.sdk.vo.TopNuoMplatformLogVo;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +55,8 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
     private NuonuoService nuonuoService;
     @Value("${oldStudySys.updateInvoicePath}")
     private String UpdateInvoice_PATH;
+    @Autowired
+    private ITopOldOrderService iTopOldOrderService;
 
     @Override
     public TopNuoMplatformLogVo queryById(Long id){
@@ -108,7 +113,9 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
         }
         TopNuoMplatformLog add = BeanUtil.toBean(bo, TopNuoMplatformLog.class);
         validEntityBeforeSave(add);
-        add.setFromPlat(2);
+        if(Validator.isEmpty(add.getFromPlat())){
+            add.setFromPlat(2);//默认旧平台
+        }
         add.setStatus(0);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -215,32 +222,41 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getStatus, Integer.parseInt(status));
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getFailCause, failCause);
                         }
-                        Map<String, String> params = new HashMap<>();
-                        Long nowTime = DateUtils.getNowTime();
-                        String sign = ToolsUtils.EncoderByMd5(nowTime.toString()+"pubilc2022");
-                        params.put("stamp", nowTime.toString());
-                        params.put("sign", sign);
-                        params.put("status", oldStatus);
-                        params.put("orderno", orderNo);
-                        params.put("pdfurl", pdfUrl);
-                        String respone = "";
-                        log.info("发票推送系统"+params,"");
-                        try {
-                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, 1);
-                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushTime, DateUtils.getNowTime());
-                            respone = HttpUtils.postFormBody(UpdateInvoice_PATH, params);
-                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushResult, respone);
-                            if (!respone.contains("\"Status\":true")) {
+                        TopNuoMplatformLog mplatformLog = getOne(new LambdaQueryWrapper<TopNuoMplatformLog>().eq(TopNuoMplatformLog::getOrderNo, orderNo));
+                        if(mplatformLog.getFromPlat()==1){
+                            this.update(null, objectLambdaUpdateWrapper);
+                            iTopOldOrderService.orderInvoice(orderNo);
+                        }
+                        else if(mplatformLog.getFromPlat()==2){
+                            //旧系统
+                            Map<String, String> params = new HashMap<>();
+                            Long nowTime = DateUtils.getNowTime();
+                            String sign = ToolsUtils.EncoderByMd5(nowTime.toString()+"pubilc2022");
+                            params.put("stamp", nowTime.toString());
+                            params.put("sign", sign);
+                            params.put("status", oldStatus);
+                            params.put("orderno", orderNo);
+                            params.put("pdfurl", pdfUrl);
+                            String respone = "";
+                            log.info("发票推送系统"+params,"");
+                            try {
+                                objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, 1);
+                                objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushTime, DateUtils.getNowTime());
+                                respone = HttpUtils.postFormBody(UpdateInvoice_PATH, params);
+                                objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushResult, respone);
+                                if (!respone.contains("\"Status\":true")) {
+                                    objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, -1);
+                                    this.update(null, objectLambdaUpdateWrapper);
+                                    //                throw new CustomException("同步请求错误"+respone);
+                                }
+                            } catch (IOException e) {
                                 objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, -1);
                                 this.update(null, objectLambdaUpdateWrapper);
-                //                throw new CustomException("同步请求错误"+respone);
+                                //            throw new CustomException("同步请求错误"+e.getMessage());
                             }
-                        } catch (IOException e) {
-                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, -1);
                             this.update(null, objectLambdaUpdateWrapper);
-                //            throw new CustomException("同步请求错误"+e.getMessage());
                         }
-                        this.update(null, objectLambdaUpdateWrapper);
+
                     }
                 }
                 snList.clear();

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

@@ -35,6 +35,8 @@ public class SysTenantQueryBo extends BaseEntity {
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
 
+	@ApiModelProperty("机构ID")
+	private Long tenantid;
 
 	/** 0 失效 1启用 */
 	@ApiModelProperty("0 失效 1启用")

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

@@ -21,11 +21,19 @@ public class SysTopTenantEditBo {
     @ApiModelProperty("机构ID")
     private Long tenantId;
 
+    private List<Long> tenantIds;
+
     /** 名称 */
     @ApiModelProperty("名称")
     @NotNull(message = "名称不能为空")
     private String tenantName;
 
+    @ApiModelProperty("")
+    private String hostH5;
+
+    @ApiModelProperty("")
+    private String hostPc;
+
     @ApiModelProperty("账单类型 (1月份 2季度 3半年 4年度)")
     private Integer billType;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysTenantService.java

@@ -67,4 +67,7 @@ public interface ISysTenantService extends IService<SysTenant> {
 	boolean addTopTenant(SysTopTenantAddBo bo);
 
 	boolean editTopTenant(SysTopTenantEditBo bo);
+
+	boolean deleteTopTenant(SysTopTenantEditBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideLogQueryBo.java

@@ -79,4 +79,6 @@ public class TopDivideLogQueryBo extends BaseEntity {
 	/** 业务号 */
 	@ApiModelProperty("业务号")
 	private String createNo;
+	@ApiModelProperty("账单类型 (1月份 2季度 3半年 4年度)")
+	private Integer billType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideOrderQueryBo.java

@@ -93,4 +93,7 @@ public class TopDivideOrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("类型 1机构分成 2业务员提成  3佣金结算")
 	private Integer divideType;
+
+	@ApiModelProperty("角色ID")
+	private Long roleId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindAddBo.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 提醒设置添加对象 top_inform_remind
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("提醒设置添加对象")
+public class TopInformRemindAddBo {
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+    /** 触发规则 */
+    @ApiModelProperty("触发规则")
+    private String logic;
+    /** 短信启用状态 1启用 0未启用 */
+    @ApiModelProperty("短信启用状态 1启用 0未启用")
+    private Integer noteStatus;
+    /** 站内信 1启用 0未启用 */
+    @ApiModelProperty("站内信 1启用 0未启用")
+    private Integer wayStatus;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 业务是否有关联 1是全部 2是部分关联 */
+    @ApiModelProperty("业务是否有关联 1是全部 2是部分关联")
+    private Long serviceStatus;
+    /** 公众号模板消息 1启用 0未启用 */
+    @ApiModelProperty("公众号模板消息 1启用 0未启用")
+    private Integer gzhTpStatus;
+    /** 1学员 2教务 */
+    @ApiModelProperty("1学员 2教务")
+    private Integer userType;
+    /** 类型：1,普通 2,订单初审 3,订单复审 4，审核通知 */
+    @ApiModelProperty("类型：1,普通 2,订单初审 3,订单复审 4，审核通知")
+    private Long type;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindEditBo.java

@@ -0,0 +1,64 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 提醒设置编辑对象 top_inform_remind
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("提醒设置编辑对象")
+public class TopInformRemindEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+
+    /** 触发规则 */
+    @ApiModelProperty("触发规则")
+    private String logic;
+
+    /** 短信启用状态 1启用 0未启用 */
+    @ApiModelProperty("短信启用状态 1启用 0未启用")
+    private Integer noteStatus;
+
+    /** 站内信 1启用 0未启用 */
+    @ApiModelProperty("站内信 1启用 0未启用")
+    private Integer wayStatus;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 业务是否有关联 1是全部 2是部分关联 */
+    @ApiModelProperty("业务是否有关联 1是全部 2是部分关联")
+    private Long serviceStatus;
+
+    /** 公众号模板消息 1启用 0未启用 */
+    @ApiModelProperty("公众号模板消息 1启用 0未启用")
+    private Integer gzhTpStatus;
+
+    /** 1学员 2教务 */
+    @ApiModelProperty("1学员 2教务")
+    private Integer userType;
+
+    /** 类型：1,普通 2,订单初审 3,订单复审 4，审核通知 */
+    @ApiModelProperty("类型：1,普通 2,订单初审 3,订单复审 4，审核通知")
+    private Long type;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindQueryBo.java

@@ -0,0 +1,66 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 提醒设置分页查询对象 top_inform_remind
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("提醒设置分页查询对象")
+public class TopInformRemindQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Long sort;
+	/** 提醒项 */
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 触发规则 */
+	@ApiModelProperty("触发规则")
+	private String logic;
+	/** 短信启用状态 1启用 0未启用 */
+	@ApiModelProperty("短信启用状态 1启用 0未启用")
+	private Integer noteStatus;
+	/** 站内信 1启用 0未启用 */
+	@ApiModelProperty("站内信 1启用 0未启用")
+	private Integer wayStatus;
+	/** 业务是否有关联 1是全部 2是部分关联 */
+	@ApiModelProperty("业务是否有关联 1是全部 2是部分关联")
+	private Long serviceStatus;
+	/** 公众号模板消息 1启用 0未启用 */
+	@ApiModelProperty("公众号模板消息 1启用 0未启用")
+	private Integer gzhTpStatus;
+	/** 1学员 2教务 */
+	@ApiModelProperty("1学员 2教务")
+	private Integer userType;
+	/** 类型：1,普通 2,订单初审 3,订单复审 4，审核通知 */
+	@ApiModelProperty("类型：1,普通 2,订单初审 3,订单复审 4，审核通知")
+	private Long type;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindRelevanceAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 消息后台账号关联添加对象 top_inform_remind_relevance
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("消息后台账号关联添加对象")
+public class TopInformRemindRelevanceAddBo {
+
+    /** 消息ID */
+    @ApiModelProperty("消息ID")
+    private Long remindId;
+    /** 关联ID（关联后台账号ID） */
+    @ApiModelProperty("关联ID（关联后台账号ID）")
+    private Long relevanceId;
+    /** 类型：1学员退学提醒，2订单审核通知 */
+    @ApiModelProperty("类型：1学员退学提醒，2订单审核通知")
+    private Integer type;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindRelevanceEditBo.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 消息后台账号关联编辑对象 top_inform_remind_relevance
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("消息后台账号关联编辑对象")
+public class TopInformRemindRelevanceEditBo {
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    /** 消息ID */
+    @ApiModelProperty("消息ID")
+    private Long remindId;
+
+    /** 关联ID（关联后台账号ID） */
+    @ApiModelProperty("关联ID（关联后台账号ID）")
+    private Long relevanceId;
+
+    /** 类型：1学员退学提醒，2订单审核通知 */
+    @ApiModelProperty("类型：1学员退学提醒，2订单审核通知")
+    private Integer type;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindRelevanceQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 消息后台账号关联分页查询对象 top_inform_remind_relevance
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("消息后台账号关联分页查询对象")
+public class TopInformRemindRelevanceQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 消息ID */
+	@ApiModelProperty("消息ID")
+	private Long remindId;
+	/** 关联ID（关联后台账号ID） */
+	@ApiModelProperty("关联ID（关联后台账号ID）")
+	private Long relevanceId;
+	/** 类型：1学员退学提醒，2订单审核通知 */
+	@ApiModelProperty("类型：1学员退学提醒，2订单审核通知")
+	private Integer type;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformSysUserAddBo.java

@@ -0,0 +1,72 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 通知绑定系统用户添加对象 top_inform_sys_user
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("通知绑定系统用户添加对象")
+public class TopInformSysUserAddBo {
+
+    /** 系统用户id */
+    @ApiModelProperty("系统用户id")
+    private Long userId;
+    /** 发送时间 */
+    @ApiModelProperty("发送时间")
+    private Long sendTime;
+    /** 发送状态 1成功 0失败 2草稿 */
+    @ApiModelProperty("发送状态 1成功 0失败 2草稿")
+    private Integer sendStatus;
+    /** 已读回执 1已读 0未读 */
+    @ApiModelProperty("已读回执 1已读 0未读")
+    private Integer receiptStatus;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long informId;
+    /** 1系统通知 2教务通知 3短信通知 */
+    @ApiModelProperty("1系统通知 2教务通知 3短信通知")
+    private Integer systemStatus;
+    /** 绑定系统通知内容 */
+    @ApiModelProperty("绑定系统通知内容")
+    private Long remindId;
+    /** 系统通知内容 */
+    @ApiModelProperty("系统通知内容")
+    private String text;
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+    /** 绑定商品ID */
+    @ApiModelProperty("绑定商品ID")
+    private Long goodsId;
+    /** 计划ID */
+    @ApiModelProperty("计划ID")
+    private Long planId;
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+    /** 学员用户ID */
+    @ApiModelProperty("学员用户ID")
+    private Long studentUserId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformSysUserEditBo.java

@@ -0,0 +1,91 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 通知绑定系统用户编辑对象 top_inform_sys_user
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("通知绑定系统用户编辑对象")
+public class TopInformSysUserEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    private List<Long> ids;
+
+    /** 系统用户id */
+    @ApiModelProperty("系统用户id")
+    private Long userId;
+
+    /** 发送时间 */
+    @ApiModelProperty("发送时间")
+    private Long sendTime;
+
+    /** 发送状态 1成功 0失败 2草稿 */
+    @ApiModelProperty("发送状态 1成功 0失败 2草稿")
+    private Integer sendStatus;
+
+    /** 已读回执 1已读 0未读 */
+    @ApiModelProperty("已读回执 1已读 0未读")
+    private Integer receiptStatus;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long informId;
+
+    /** 1系统通知 2教务通知 3短信通知 */
+    @ApiModelProperty("1系统通知 2教务通知 3短信通知")
+    private Integer systemStatus;
+
+    /** 绑定系统通知内容 */
+    @ApiModelProperty("绑定系统通知内容")
+    private Long remindId;
+
+    /** 系统通知内容 */
+    @ApiModelProperty("系统通知内容")
+    private String text;
+
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+
+    /** 绑定商品ID */
+    @ApiModelProperty("绑定商品ID")
+    private Long goodsId;
+
+    /** 计划ID */
+    @ApiModelProperty("计划ID")
+    private Long planId;
+
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+
+    /** 学员用户ID */
+    @ApiModelProperty("学员用户ID")
+    private Long studentUserId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformSysUserQueryBo.java

@@ -0,0 +1,84 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 通知绑定系统用户分页查询对象 top_inform_sys_user
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("通知绑定系统用户分页查询对象")
+public class TopInformSysUserQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 系统用户id */
+	@ApiModelProperty("系统用户id")
+	private Long userId;
+	/** 发送时间 */
+	@ApiModelProperty("发送时间")
+	private Long sendTime;
+	/** 发送状态 1成功 0失败 2草稿 */
+	@ApiModelProperty("发送状态 1成功 0失败 2草稿")
+	private Integer sendStatus;
+	/** 已读回执 1已读 0未读 */
+	@ApiModelProperty("已读回执 1已读 0未读")
+	private Integer receiptStatus;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long informId;
+	/** 1系统通知 2教务通知 3短信通知 */
+	@ApiModelProperty("1系统通知 2教务通知 3短信通知")
+	private Integer systemStatus;
+	/** 绑定系统通知内容 */
+	@ApiModelProperty("绑定系统通知内容")
+	private Long remindId;
+	/** 系统通知内容 */
+	@ApiModelProperty("系统通知内容")
+	private String text;
+	/** 提醒项 */
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 绑定商品ID */
+	@ApiModelProperty("绑定商品ID")
+	private Long goodsId;
+	/** 计划ID */
+	@ApiModelProperty("计划ID")
+	private Long planId;
+	/** 班级ID */
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 状态 1有效 0无效 */
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+	/** 学员用户ID */
+	@ApiModelProperty("学员用户ID")
+	private Long studentUserId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformRemind.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 提醒设置对象 top_inform_remind
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_inform_remind")
+public class TopInformRemind implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 排序 */
+    private Long sort;
+    /** 提醒项 */
+    private String remind;
+    /** 触发规则 */
+    private String logic;
+    /** 短信启用状态 1启用 0未启用 */
+    private Integer noteStatus;
+    /** 站内信 1启用 0未启用 */
+    private Integer wayStatus;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 业务是否有关联 1是全部 2是部分关联 */
+    private Long serviceStatus;
+    /** 公众号模板消息 1启用 0未启用 */
+    private Integer gzhTpStatus;
+    /** 1学员 2教务 */
+    private Integer userType;
+    /** 类型：1,普通 2,订单初审 3,订单复审 4，审核通知 */
+    private Integer type;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformRemindRelevance.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 消息后台账号关联对象 top_inform_remind_relevance
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_inform_remind_relevance")
+public class TopInformRemindRelevance implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    private Long id;
+    /** 消息ID */
+    private Long remindId;
+    /** 关联ID（关联后台账号ID） */
+    private Long relevanceId;
+    /** 类型：1学员退学提醒，2订单审核通知 */
+    private Integer type;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformSysUser.java

@@ -0,0 +1,65 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 通知绑定系统用户对象 top_inform_sys_user
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_inform_sys_user")
+public class TopInformSysUser implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 系统用户id */
+    private Long userId;
+    /** 发送时间 */
+    private Long sendTime;
+    /** 发送状态 1成功 0失败 2草稿 */
+    private Integer sendStatus;
+    /** 已读回执 1已读 0未读 */
+    private Integer receiptStatus;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** $column.columnComment */
+    private Long informId;
+    /** 1系统通知 2教务通知 3短信通知 */
+    private Integer systemStatus;
+    /** 绑定系统通知内容 */
+    private Long remindId;
+    /** 系统通知内容 */
+    private String text;
+    /** 提醒项 */
+    private String remind;
+    /** 绑定商品ID */
+    private Long goodsId;
+    /** 计划ID */
+    private Long planId;
+    /** 班级ID */
+    private Long gradeId;
+    /** 订单商品ID */
+    private Long orderGoodsId;
+    /** 状态 1有效 0无效 */
+    private Integer status;
+    /** 学员用户ID */
+    private Long studentUserId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopDivideOrderMapper.java

@@ -26,6 +26,8 @@ public interface TopDivideOrderMapper extends BaseMapper<TopDivideOrder> {
 
     List<TopDivideOrderVo> getMonthFinishList(TopDivideOrderQueryBo bo);
 
+    List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo);
+
     List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo);
 
     List<TopDivideOrderVo> getMonthRefundList(TopDivideOrderQueryBo bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopInformRemindMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemind;
+
+/**
+ * 提醒设置Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface TopInformRemindMapper extends BaseMapper<TopInformRemind> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopInformRemindRelevanceMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemindRelevance;
+
+/**
+ * 消息后台账号关联Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface TopInformRemindRelevanceMapper extends BaseMapper<TopInformRemindRelevance> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopInformSysUserMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.domain.TopInformSysUser;
+
+/**
+ * 通知绑定系统用户Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface TopInformSysUserMapper extends BaseMapper<TopInformSysUser> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopDivideOrderService.java

@@ -59,6 +59,8 @@ public interface ITopDivideOrderService extends IService<TopDivideOrder> {
 
 	List<TopDivideOrderVo> getMonthFinishList(TopDivideOrderQueryBo bo);
 
+	List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo);
+
 	List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo);
 
 	List<TopDivideOrderVo> getMonthRefundList(TopDivideOrderQueryBo bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopInformRemindRelevanceService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.financial.service;
+
+;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemindRelevance;
+import com.zhongzheng.modules.top.financial.vo.TopInformRemindRelevanceVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 消息后台账号关联Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface ITopInformRemindRelevanceService extends IService<TopInformRemindRelevance> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopInformRemindRelevanceVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopInformRemindRelevanceVo> queryList(TopInformRemindRelevanceQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入消息后台账号关联
+	 * @param bo 消息后台账号关联新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopInformRemindRelevanceAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改消息后台账号关联
+	 * @param bo 消息后台账号关联编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopInformRemindRelevanceEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopInformRemindService.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.top.financial.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.inform.vo.InformRemindVo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemind;
+import com.zhongzheng.modules.top.financial.vo.TopInformRemindVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 提醒设置Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface ITopInformRemindService extends IService<TopInformRemind> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopInformRemindVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopInformRemindVo> queryList(TopInformRemindQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入提醒设置
+	 * @param bo 提醒设置新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopInformRemindAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改提醒设置
+	 * @param bo 提醒设置编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopInformRemindEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    InformRemindVo queryByName(String name);
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopInformSysUserService.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.top.financial.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformSysUser;
+import com.zhongzheng.modules.top.financial.vo.TopInformSysUserVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 通知绑定系统用户Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface ITopInformSysUserService extends IService<TopInformSysUser> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopInformSysUserVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopInformSysUserVo> queryList(TopInformSysUserQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入通知绑定系统用户
+	 * @param bo 通知绑定系统用户新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopInformSysUserAddBo bo);
+
+	Integer informUnReadSum(Long userId);
+
+	Boolean updateReadStatusBatch(TopInformSysUserEditBo bo);
+
+	/**
+	 * 根据编辑业务对象修改通知绑定系统用户
+	 * @param bo 通知绑定系统用户编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopInformSysUserEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopDivideOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.financial.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
@@ -22,6 +23,7 @@ import com.github.pagehelper.Page;
 
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -109,7 +111,13 @@ public class TopDivideOrderServiceImpl extends ServiceImpl<TopDivideOrderMapper,
     @Override
     public List<TopDivideOrderVo> getMonthOrderList(TopDivideOrderQueryBo bo) {
         List<TopDivideOrderVo> fList = baseMapper.getFinishList(bo);
-        List<TopDivideOrderVo> rList = baseMapper.getRefundList(bo);
+        List<TopDivideOrderVo> rList;
+        if(Validator.isEmpty(bo.getRoleId())){
+            rList = baseMapper.getRefundList(bo);
+        }else{
+            rList = new ArrayList<>();
+        }
+
         for(TopDivideOrderVo vo : rList){
             if(vo.getPayStatus()==1){
                 vo.setCheckStatus(3);
@@ -127,6 +135,11 @@ public class TopDivideOrderServiceImpl extends ServiceImpl<TopDivideOrderMapper,
         return baseMapper.getMonthFinishList(bo);
     }
 
+    @Override
+    public List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo) {
+        return baseMapper.getMonthCreditList(bo);
+    }
+
     @Override
     public List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo) {
         return baseMapper.getMonthFinishAllTenant(bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopInformRemindRelevanceServiceImpl.java

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemindRelevance;
+import com.zhongzheng.modules.top.financial.mapper.TopInformRemindRelevanceMapper;
+import com.zhongzheng.modules.top.financial.service.ITopInformRemindRelevanceService;
+import com.zhongzheng.modules.top.financial.vo.TopInformRemindRelevanceVo;
+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;
+
+/**
+ * 消息后台账号关联Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Service
+public class TopInformRemindRelevanceServiceImpl extends ServiceImpl<TopInformRemindRelevanceMapper, TopInformRemindRelevance> implements ITopInformRemindRelevanceService {
+
+    @Override
+    public TopInformRemindRelevanceVo queryById(Long id){
+        TopInformRemindRelevance db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TopInformRemindRelevanceVo.class);
+    }
+
+    @Override
+    public List<TopInformRemindRelevanceVo> queryList(TopInformRemindRelevanceQueryBo bo) {
+        LambdaQueryWrapper<TopInformRemindRelevance> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getRemindId() != null, TopInformRemindRelevance::getRemindId, bo.getRemindId());
+        lqw.eq(bo.getRelevanceId() != null, TopInformRemindRelevance::getRelevanceId, bo.getRelevanceId());
+        lqw.eq(bo.getType() != null, TopInformRemindRelevance::getType, bo.getType());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopInformRemindRelevanceVo> entity2Vo(Collection<TopInformRemindRelevance> collection) {
+        List<TopInformRemindRelevanceVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopInformRemindRelevanceVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopInformRemindRelevance> page = (Page<TopInformRemindRelevance>)collection;
+            Page<TopInformRemindRelevanceVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopInformRemindRelevanceAddBo bo) {
+        TopInformRemindRelevance add = BeanUtil.toBean(bo, TopInformRemindRelevance.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopInformRemindRelevanceEditBo bo) {
+        TopInformRemindRelevance update = BeanUtil.toBean(bo, TopInformRemindRelevance.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopInformRemindRelevance entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopInformRemindServiceImpl.java

@@ -0,0 +1,118 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.inform.domain.InformRemind;
+import com.zhongzheng.modules.inform.vo.InformRemindBusinessVo;
+import com.zhongzheng.modules.inform.vo.InformRemindVo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemind;
+import com.zhongzheng.modules.top.financial.mapper.TopInformRemindMapper;
+import com.zhongzheng.modules.top.financial.service.ITopInformRemindService;
+import com.zhongzheng.modules.top.financial.vo.TopInformRemindVo;
+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;
+
+/**
+ * 提醒设置Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Service
+public class TopInformRemindServiceImpl extends ServiceImpl<TopInformRemindMapper, TopInformRemind> implements ITopInformRemindService {
+
+    @Override
+    public TopInformRemindVo queryById(Long id){
+        TopInformRemind db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TopInformRemindVo.class);
+    }
+
+    @Override
+    public List<TopInformRemindVo> queryList(TopInformRemindQueryBo bo) {
+        LambdaQueryWrapper<TopInformRemind> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSort() != null, TopInformRemind::getSort, bo.getSort());
+        lqw.eq(StrUtil.isNotBlank(bo.getRemind()), TopInformRemind::getRemind, bo.getRemind());
+        lqw.eq(StrUtil.isNotBlank(bo.getLogic()), TopInformRemind::getLogic, bo.getLogic());
+        lqw.eq(bo.getNoteStatus() != null, TopInformRemind::getNoteStatus, bo.getNoteStatus());
+        lqw.eq(bo.getWayStatus() != null, TopInformRemind::getWayStatus, bo.getWayStatus());
+        lqw.eq(bo.getServiceStatus() != null, TopInformRemind::getServiceStatus, bo.getServiceStatus());
+        lqw.eq(bo.getGzhTpStatus() != null, TopInformRemind::getGzhTpStatus, bo.getGzhTpStatus());
+        lqw.eq(bo.getUserType() != null, TopInformRemind::getUserType, bo.getUserType());
+        lqw.eq(bo.getType() != null, TopInformRemind::getType, bo.getType());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopInformRemindVo> entity2Vo(Collection<TopInformRemind> collection) {
+        List<TopInformRemindVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopInformRemindVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopInformRemind> page = (Page<TopInformRemind>)collection;
+            Page<TopInformRemindVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopInformRemindAddBo bo) {
+        TopInformRemind add = BeanUtil.toBean(bo, TopInformRemind.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopInformRemindEditBo bo) {
+        TopInformRemind update = BeanUtil.toBean(bo, TopInformRemind.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopInformRemind entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public InformRemindVo queryByName(String name) {
+        TopInformRemind db = getOne(new LambdaQueryWrapper<TopInformRemind>().eq(TopInformRemind::getRemind, name).last("limit 1"));
+        InformRemindVo informRemindVo = BeanUtil.toBean(db, InformRemindVo.class);
+        return informRemindVo;
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopInformSysUserServiceImpl.java

@@ -0,0 +1,158 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+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.modules.top.financial.bo.TopInformSysUserAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemind;
+import com.zhongzheng.modules.top.financial.domain.TopInformSysUser;
+import com.zhongzheng.modules.top.financial.mapper.TopInformSysUserMapper;
+import com.zhongzheng.modules.top.financial.service.ITopInformRemindService;
+import com.zhongzheng.modules.top.financial.service.ITopInformSysUserService;
+import com.zhongzheng.modules.top.financial.vo.TopInformSysUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 通知绑定系统用户Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Service
+public class TopInformSysUserServiceImpl extends ServiceImpl<TopInformSysUserMapper, TopInformSysUser> implements ITopInformSysUserService {
+    
+    @Autowired
+    private ITopInformRemindService iInformRemindService;
+
+    @Override
+    public TopInformSysUserVo queryById(Long id){
+        TopInformSysUser db = this.baseMapper.selectById(id);
+        TopInformSysUserVo vo = BeanUtil.toBean(db, TopInformSysUserVo.class);
+        if (ObjectUtils.isNotNull(vo.getRemindId())){
+            TopInformRemind informRemind = iInformRemindService.getById(vo.getRemindId());
+            vo.setType(informRemind.getType());
+        }else {
+            vo.setType(1);
+        }
+        return vo;
+    }
+
+    @Override
+    public List<TopInformSysUserVo> queryList(TopInformSysUserQueryBo bo) {
+        LambdaQueryWrapper<TopInformSysUser> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, TopInformSysUser::getUserId, bo.getUserId());
+        lqw.eq(bo.getSendTime() != null, TopInformSysUser::getSendTime, bo.getSendTime());
+        lqw.eq(bo.getSendStatus() != null, TopInformSysUser::getSendStatus, bo.getSendStatus());
+        lqw.eq(bo.getReceiptStatus() != null, TopInformSysUser::getReceiptStatus, bo.getReceiptStatus());
+        lqw.eq(bo.getInformId() != null, TopInformSysUser::getInformId, bo.getInformId());
+        lqw.eq(bo.getSystemStatus() != null, TopInformSysUser::getSystemStatus, bo.getSystemStatus());
+        lqw.eq(bo.getRemindId() != null, TopInformSysUser::getRemindId, bo.getRemindId());
+        lqw.eq(StrUtil.isNotBlank(bo.getText()), TopInformSysUser::getText, bo.getText());
+        lqw.eq(StrUtil.isNotBlank(bo.getRemind()), TopInformSysUser::getRemind, bo.getRemind());
+        lqw.eq(bo.getGoodsId() != null, TopInformSysUser::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getPlanId() != null, TopInformSysUser::getPlanId, bo.getPlanId());
+        lqw.eq(bo.getGradeId() != null, TopInformSysUser::getGradeId, bo.getGradeId());
+        lqw.eq(bo.getOrderGoodsId() != null, TopInformSysUser::getOrderGoodsId, bo.getOrderGoodsId());
+        lqw.eq(bo.getStatus() != null, TopInformSysUser::getStatus, bo.getStatus());
+        List<TopInformSysUserVo> informSysUserVos = entity2Vo(this.list(lqw));
+        if (CollectionUtils.isEmpty(informSysUserVos)){
+            return new ArrayList<>();
+        }
+        informSysUserVos.forEach(item -> {
+            if (ObjectUtils.isNotNull(item.getRemindId())){
+                TopInformRemind informRemind = iInformRemindService.getById(item.getRemindId());
+                item.setType(informRemind.getType());
+            }else {
+                item.setType(1);
+            }
+        });
+        return informSysUserVos;
+    }
+
+    /**
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
+    private List<TopInformSysUserVo> entity2Vo(Collection<TopInformSysUser> collection) {
+        List<TopInformSysUserVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopInformSysUserVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopInformSysUser> page = (Page<TopInformSysUser>)collection;
+            Page<TopInformSysUserVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopInformSysUserAddBo bo) {
+        TopInformSysUser add = BeanUtil.toBean(bo, TopInformSysUser.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Integer informUnReadSum(Long userId) {
+        return count(new LambdaQueryWrapper<TopInformSysUser>()
+                .eq(TopInformSysUser::getUserId,userId).eq(TopInformSysUser::getReceiptStatus,0).eq(TopInformSysUser::getSystemStatus,1)
+                .eq(TopInformSysUser::getStatus,1));
+    }
+
+    @Override
+    public Boolean updateReadStatusBatch(TopInformSysUserEditBo bo) {
+        boolean result = false;
+        for(Long id : bo.getIds()){
+            TopInformSysUserEditBo editBo = new TopInformSysUserEditBo();
+            editBo.setId(id);
+            editBo.setReceiptStatus(bo.getReceiptStatus());
+            result = updateByEditBo(editBo);
+        }
+        return result;
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopInformSysUserEditBo bo) {
+        TopInformSysUser update = BeanUtil.toBean(bo, TopInformSysUser.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopInformSysUser entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopDivideOrderVo.java

@@ -95,5 +95,11 @@ public class TopDivideOrderVo {
 	private String createNo;
 	@ApiModelProperty("佣金")
 	private BigDecimal brokerage;
+	@ApiModelProperty("角色名称")
+	private String roleName;
 
+	@ApiModelProperty("订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单 ")
+	private Integer orderFrom;
+	@ApiModelProperty("角色ID")
+	private Long roleId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopInformRemindRelevanceVo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.top.financial.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 消息后台账号关联视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("消息后台账号关联视图对象")
+public class TopInformRemindRelevanceVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+	@ApiModelProperty("主键")
+	private Long id;
+
+	/** 消息ID */
+	@Excel(name = "消息ID")
+	@ApiModelProperty("消息ID")
+	private Long remindId;
+	/** 关联ID（关联后台账号ID） */
+	@Excel(name = "关联ID" , readConverterExp = "关=联后台账号ID")
+	@ApiModelProperty("关联ID（关联后台账号ID）")
+	private Long relevanceId;
+	/** 类型：1学员退学提醒，2订单审核通知 */
+	@Excel(name = "类型：1学员退学提醒，2订单审核通知")
+	@ApiModelProperty("类型：1学员退学提醒，2订单审核通知")
+	private Integer type;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopInformRemindVo.java

@@ -0,0 +1,63 @@
+package com.zhongzheng.modules.top.financial.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 提醒设置视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("提醒设置视图对象")
+public class TopInformRemindVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Long sort;
+	/** 提醒项 */
+	@Excel(name = "提醒项")
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 触发规则 */
+	@Excel(name = "触发规则")
+	@ApiModelProperty("触发规则")
+	private String logic;
+	/** 短信启用状态 1启用 0未启用 */
+	@Excel(name = "短信启用状态 1启用 0未启用")
+	@ApiModelProperty("短信启用状态 1启用 0未启用")
+	private Integer noteStatus;
+	/** 站内信 1启用 0未启用 */
+	@Excel(name = "站内信 1启用 0未启用")
+	@ApiModelProperty("站内信 1启用 0未启用")
+	private Integer wayStatus;
+	/** 业务是否有关联 1是全部 2是部分关联 */
+	@Excel(name = "业务是否有关联 1是全部 2是部分关联")
+	@ApiModelProperty("业务是否有关联 1是全部 2是部分关联")
+	private Long serviceStatus;
+	/** 公众号模板消息 1启用 0未启用 */
+	@Excel(name = "公众号模板消息 1启用 0未启用")
+	@ApiModelProperty("公众号模板消息 1启用 0未启用")
+	private Integer gzhTpStatus;
+	/** 1学员 2教务 */
+	@Excel(name = "1学员 2教务")
+	@ApiModelProperty("1学员 2教务")
+	private Integer userType;
+	/** 类型：1,普通 2,订单初审 3,订单复审 4，审核通知 */
+	@Excel(name = "类型：1,普通 2,订单初审 3,订单复审 4，审核通知")
+	@ApiModelProperty("类型：1,普通 2,订单初审 3,订单复审 4，审核通知")
+	private Long type;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopInformSysUserVo.java

@@ -0,0 +1,90 @@
+package com.zhongzheng.modules.top.financial.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 通知绑定系统用户视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("通知绑定系统用户视图对象")
+public class TopInformSysUserVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 系统用户id */
+	@Excel(name = "系统用户id")
+	@ApiModelProperty("系统用户id")
+	private Long userId;
+	/** 发送时间 */
+	@Excel(name = "发送时间")
+	@ApiModelProperty("发送时间")
+	private Long sendTime;
+	/** 发送状态 1成功 0失败 2草稿 */
+	@Excel(name = "发送状态 1成功 0失败 2草稿")
+	@ApiModelProperty("发送状态 1成功 0失败 2草稿")
+	private Integer sendStatus;
+	/** 已读回执 1已读 0未读 */
+	@Excel(name = "已读回执 1已读 0未读")
+	@ApiModelProperty("已读回执 1已读 0未读")
+	private Integer receiptStatus;
+	/** $column.columnComment */
+	@Excel(name = "已读回执 1已读 0未读")
+	@ApiModelProperty("$column.columnComment")
+	private Long informId;
+	/** 1系统通知 2教务通知 3短信通知 */
+	@Excel(name = "1系统通知 2教务通知 3短信通知")
+	@ApiModelProperty("1系统通知 2教务通知 3短信通知")
+	private Integer systemStatus;
+	/** 绑定系统通知内容 */
+	@Excel(name = "绑定系统通知内容")
+	@ApiModelProperty("绑定系统通知内容")
+	private Long remindId;
+	/** 系统通知内容 */
+	@Excel(name = "系统通知内容")
+	@ApiModelProperty("系统通知内容")
+	private String text;
+	/** 提醒项 */
+	@Excel(name = "提醒项")
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 绑定商品ID */
+	@Excel(name = "绑定商品ID")
+	@ApiModelProperty("绑定商品ID")
+	private Long goodsId;
+	/** 计划ID */
+	@Excel(name = "计划ID")
+	@ApiModelProperty("计划ID")
+	private Long planId;
+	/** 班级ID */
+	@Excel(name = "班级ID")
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 状态 1有效 0无效 */
+	@Excel(name = "状态 1有效 0无效")
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+	/** 学员用户ID */
+	@Excel(name = "学员用户ID")
+	@ApiModelProperty("学员用户ID")
+	private Long studentUserId;
+
+	@ApiModelProperty("/** 类型：1,普通 2,订单初审 3,订单复审 4，审核通知 */")
+	private Integer type;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderAddBo.java

@@ -182,4 +182,7 @@ public class TopOldOrderAddBo {
     /** 佣金 */
     @ApiModelProperty("佣金")
     private BigDecimal brokerage;
+
+    @ApiModelProperty("下单企业")
+    private String purchaseOrg;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderCheckLogEditBo.java

@@ -71,4 +71,7 @@ public class TopOldOrderCheckLogEditBo {
 
     @ApiModelProperty("审核结果：1同意，-1拒绝")
     private Integer checkResult;
+
+    @ApiModelProperty("审核角色名称")
+    private String checkRoleName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOldOrder.java

@@ -144,4 +144,10 @@ private static final long serialVersionUID=1L;
     /** 税率上一次记录 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal pretaxRecord;
+    /** 审核时间 */
+    private Long checkTime;
+    /** 账款结清时间 */
+    private Long creditTime;
+    /** 下单企业 */
+    private String purchaseOrg;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderCheckLogService.java

@@ -45,6 +45,8 @@ public interface ITopOldOrderCheckLogService extends IService<TopOldOrderCheckLo
 
 	Boolean updateDivideByEditBo(TopOldOrderCheckLogEditBo bo);
 
+	Boolean updateBatchDivideByEditBo(List<TopOldOrderCheckLogEditBo> bo);
+
 	/**
 	 * 校验并删除数据
 	 * @param ids 主键集合

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderService.java

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
 import com.zhongzheng.modules.top.goods.vo.TopOrderStatisticsVo;
 import com.zhongzheng.modules.top.order.bo.PayOrderCallBackBo;
 import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderCommissionExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 import com.zhongzheng.modules.top.goods.vo.TopRefundOrderDetailVo;
@@ -95,6 +96,7 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 
 	List<TopOldOrderSellerExportVo> sellerListExport(TopDivideLogQueryBo bo);
 
+	List<TopOldOrderCommissionExportVo> commissionListExport(TopDivideLogQueryBo bo);
 
 	TopCostTpVo getOrderCost(String orderSn);
 
@@ -122,9 +124,13 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 
     boolean orderRefundPay(OrderRefundPayBo bo);
 
+    void orderInvoice(String invoiceSn);
+
 	OrderRefundPayDetailVo getOrderRefundPayDetail(String orderSn);
 
 	boolean updateOrderInfo(TopOldOrderAddBo bo);
 
 	boolean editOrderBrokerage(OrderBrokerageBo bo);
+
+	void informRemindOrderCheck(String result);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderCheckLogServiceImpl.java

@@ -157,6 +157,14 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
         return true;
     }
 
+    @Override
+    public Boolean updateBatchDivideByEditBo(List<TopOldOrderCheckLogEditBo> bo) {
+        for(TopOldOrderCheckLogEditBo editBo : bo){
+            updateDivideByEditBo(editBo);
+        }
+        return true;
+    }
+
     public void consentCheck(TopOldOrderCheckLog checkLog, TopOldOrderCheckLogEditBo bo) {
         List<TopOldOrderCheckLog> checkLogList = list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                         .eq(TopOldOrderCheckLog::getOrderSn, checkLog.getOrderSn())
@@ -181,6 +189,19 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
                     .eq(TopOldOrderCheckLog::getCheckSort, checkLog.getCheckSort() + 1)
                     .eq(TopOldOrderCheckLog::getCheckFrom, checkLog.getCheckFrom()));
         } else {
+            String checkFrom = "";
+            if(checkLog.getCheckFrom()==2){
+                checkFrom = "机构分成";
+            }
+            else if(checkLog.getCheckFrom()==3){
+                checkFrom = "业务员提成";
+            }
+            else if(checkLog.getCheckFrom()==4){
+                checkFrom = "佣金结算";
+            }
+            //抄送总经理
+            //消息通知
+            iTopOldOrderService.informRemindOrderCheck(String.format("【%s】订单"+checkFrom+"已通过【%s】审核",checkLog.getOrderSn(),bo.getLoginName()));
             //最后一个审核
             //进入支付流程
             TopOldOrderCheckLog check = getOne(new LambdaQueryWrapper<TopOldOrderCheckLog>()
@@ -205,7 +226,7 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
                 List<TopDivideOrderVo> listOrder = iTopDivideOrderService.getFinishList(queryBo);
                 boolean allWaitPay = true;
                 for(TopDivideOrderVo divideOrderVo : listOrder){
-                    if(divideOrderVo.getCheckStatus()!=2){
+                    if(Validator.isNotEmpty(divideOrderVo.getCheckStatus())&&divideOrderVo.getCheckStatus()!=2){
                         allWaitPay = false;
                     }
                 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderVo.java

@@ -262,8 +262,15 @@ public class TopOldOrderVo {
 
 	@ApiModelProperty("税率")
 	private String pretaxStr;
+	/** 审核时间 */
+	private Long checkTime;
+	/** 账款结清时间 */
+	private Long creditTime;
 
 
 	@ApiModelProperty("是否坏账")
 	private boolean badBill;
+
+	@ApiModelProperty("下单企业")
+	private String purchaseOrg;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderBankPayServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
@@ -23,7 +24,6 @@ import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
 import com.zhongzheng.modules.top.order.mapper.TopOrderBankPayMapper;
 import com.zhongzheng.modules.top.order.service.ITopOrderBankPayService;
 import com.zhongzheng.modules.top.order.vo.TopOrderBankPayVo;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
 import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
 import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
 import com.zhongzheng.modules.top.user.service.ITopSysUserRoleService;
@@ -68,6 +68,7 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
     @Autowired
     private ITopDivideLogService iTopDivideLogService;
 
+
     @Value("${oldSys.host}")
     private String OLD_SYS_HOST;
 
@@ -178,14 +179,16 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
         if(Validator.isEmpty(divideLog)){
             throw new CustomException("审核数据错误");
         }
-        if(divideLog.getPayStatus()!=0){
+        if(divideLog.getPayStatus()!=0&&divideLog.getPayStatus()!=4){
             throw new CustomException("非待支付状态");
         }
-
+        List<Integer> pStatus = new ArrayList<>();
+        pStatus.add(0);
+        pStatus.add(4);
         TopDivideLog divideLogFirst = iTopDivideLogService.getOne(new LambdaQueryWrapper<TopDivideLog>()
                 .eq(TopDivideLog::getTenantId, divideLog.getTenantId())
                 .eq(TopDivideLog::getDivideType, divideLog.getDivideType())
-                .eq(TopDivideLog::getPayStatus, 0).last("limit 1"));
+                .in(TopDivideLog::getPayStatus, pStatus).last("limit 1"));
         if(!divideLogFirst.getId().equals(divideLog.getId())){
             throw new CustomException("存在历史未支付月份");
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderRecNoteServiceImpl.java

@@ -12,6 +12,9 @@ import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.bank.domain.ExamQuestion;
 import com.zhongzheng.modules.base.domain.ShoppingCart;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
+import com.zhongzheng.modules.top.financial.domain.TopDivideLog;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
 import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
 import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteEditBo;
 import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteQueryBo;
@@ -19,6 +22,8 @@ import com.zhongzheng.modules.top.order.domain.TopOrderRecNote;
 import com.zhongzheng.modules.top.order.mapper.TopOrderRecNoteMapper;
 import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
 import com.zhongzheng.modules.top.order.vo.TopOrderRecNoteVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -26,6 +31,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -38,6 +44,14 @@ import java.util.stream.Collectors;
 @Service
 public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMapper, TopOrderRecNote> implements ITopOrderRecNoteService {
 
+
+    @Autowired
+    private ITopOldOrderService iTopOldOrderService;
+
+    @Value("${oldSys.host}")
+    private String OLD_SYS_HOST;
+
+
     @Override
     public TopOrderRecNoteVo queryById(Long id){
         TopOrderRecNote db = this.baseMapper.selectById(id);
@@ -90,10 +104,11 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         if(bo.getNoteType()==1){
-            pushOldNote(bo.getOrderSn());
-            bo.setLastTime(DateUtils.getNowTime());
+            this.save(add);
+            return pushOldNote(bo.getOrderSn());
+        }else{
+            return this.save(add);
         }
-        return this.save(add);
     }
 
     @Override
@@ -118,6 +133,11 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
     }
 
     private boolean pushOldNote(String orderSn){
+        TopOldOrder oldOrder = iTopOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>()
+                .eq(TopOldOrder::getOrderSn, orderSn));
+        if(oldOrder.getOrderUncollected().compareTo(BigDecimal.ZERO)!=1){
+            return false;
+        }
         Map<String, String> params = new HashMap<>();
         Long nowTime = DateUtils.getNowTime();
         String sign = ToolsUtils.EncoderByMd5(orderSn+"pubilc2022");
@@ -125,7 +145,7 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         params.put("sign", sign);
         params.put("orderNos", orderSn);
         String respone = "";
-        String path = "http://gdxypx.xy.com/WitSystem/BussinessApi/PressMsg";
+        String path = OLD_SYS_HOST+"/WitSystem/BussinessApi/PressMsg";
         try {
             respone = HttpUtils.postFormBody(path, params);
             if (!respone.contains("\"Status\":true")) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOldOrderCommissionExportVo.java

@@ -0,0 +1,68 @@
+package com.zhongzheng.modules.top.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单视图对象")
+public class TopOldOrderCommissionExportVo {
+	private static final long serialVersionUID = 1L;
+
+	@Excel(name = "时间")
+	@ApiModelProperty("时间")
+	private String timeStr;
+
+	@Excel(name = "机构名称")
+	@ApiModelProperty("机构名称")
+	private String tenantName;
+	/** 业务员名称 */
+	@Excel(name = "业务员")
+	@ApiModelProperty("业务员名称")
+	private String createUsername;
+	/** 业务号 */
+	@Excel(name = "业务号")
+	@ApiModelProperty("业务号")
+	private String createNo;
+
+	@Excel(name = "已付分成(元)")
+	@ApiModelProperty("已付分成(元)")
+	private BigDecimal payMoney;
+	@Excel(name = "已扣分成(元)")
+	@ApiModelProperty("已扣分成(元)")
+	private BigDecimal deductMoney;
+
+
+	@Excel(name = "待付分成(元)")
+	@ApiModelProperty("待付分成(元)")
+	private BigDecimal waitPayMoney;
+	@Excel(name = "待扣分成(元)")
+	@ApiModelProperty("待扣分成(元)")
+	private BigDecimal waitDeductMoney;
+	@Excel(name = "预付时间")
+	@ApiModelProperty("预付时间")
+	private String predictPayTime;
+	@Excel(name = "预付款剩余天数")
+	@ApiModelProperty("预付款剩余天数")
+	private Integer predictPayDay;
+	@Excel(name = "审核状态")
+	@ApiModelProperty("审核状态")
+	private String checkStatus;
+	@Excel(name = "支付时间")
+	@ApiModelProperty("支付时间")
+	private String payTime;
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOldOrderCompanyExportVo.java

@@ -60,7 +60,7 @@ public class TopOldOrderCompanyExportVo {
 	@Excel(name = "支付时间")
 	@ApiModelProperty("支付时间")
 	private String payTime;
-	@Excel(name = "remark")
+	@Excel(name = "备注")
 	@ApiModelProperty("备注")
 	private String remark;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOldOrderExportVo.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.top.order.vo;
 
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.zhongzheng.common.annotation.Excel;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderAttachmentVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -51,6 +51,10 @@ public class TopOldOrderExportVo {
 	@Excel(name = "合同金额(元)")
 	@ApiModelProperty("订单标准价格")
 	private BigDecimal orderPrice;
+
+	@Excel(name = "已退金额(元)")
+	@ApiModelProperty("已退金额（元）")
+	private BigDecimal orderRefunded;
 	/** 实收账款（元） */
 	@Excel(name = "已收账款(元)")
 	@ApiModelProperty("实收账款（元）")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/mapper/TopSysPostMapper.java

@@ -28,4 +28,6 @@ public interface TopSysPostMapper extends BaseMapper<TopSysPost> {
      * @return 结果
      */
     List<TopSysPost> selectPostsByUserName(String userName);
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/mapper/TopSysRoleMapper.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.top.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 
 import java.util.List;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/mapper/TopSysUserPostMapper.java

@@ -2,8 +2,12 @@ package com.zhongzheng.modules.top.user.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.system.domain.SysPost;
+import com.zhongzheng.modules.top.user.domain.TopSysPost;
 import com.zhongzheng.modules.top.user.domain.TopSysUserPost;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  *

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/mapper/TopSysUserRoleMapper.java

@@ -2,8 +2,12 @@ package com.zhongzheng.modules.top.user.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.common.core.domain.entity.SysRole;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
 
+import java.util.List;
+
 /**
  * 用户和角色关联Mapper接口
  *
@@ -11,5 +15,5 @@ import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
  * @date 2023-03-10
  */
 public interface TopSysUserRoleMapper extends BaseMapper<TopSysUserRole> {
-
+    public List<TopSysRole> selectRolesByUserName(String userName);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/service/ITopSysRoleService.java

@@ -1,7 +1,8 @@
 package com.zhongzheng.modules.top.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
+import com.zhongzheng.common.core.domain.entity.SysRole;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 
 import java.util.List;
 import java.util.Set;
@@ -130,4 +131,6 @@ import java.util.Set;
      * @return 结果
      */
      int deleteRoleByIds(Long[] roleIds);
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/service/ITopSysUserService.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.user.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.top.user.bo.TopSysUserAddBo;
@@ -145,4 +146,14 @@ public interface ITopSysUserService extends IService<TopSysUser> {
     TopSysUser getTopSysUser(Long createTopSysUserId);
 
     List<String> getRoleKeyById(Long loginId);
+
+	public String selectUserRoleGroup(String userName);
+
+	public String selectUserPostGroup(String userName);
+
+	public int updateUserProfile(TopSysUser user);
+
+	public int resetUserPwd(String userName, String password);
+
+	public boolean updateUserAvatar(String userName, String avatar);
 }

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

@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.constant.UserConstants;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.modules.top.user.domain.TopSysDept;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
 import com.zhongzheng.modules.top.user.mapper.TopSysDeptMapper;
 import com.zhongzheng.modules.top.user.mapper.TopSysRoleMapper;
 import com.zhongzheng.modules.top.user.mapper.TopSysUserMapper;

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

@@ -5,12 +5,12 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.constant.UserConstants;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.modules.system.domain.vo.MetaVo;
 import com.zhongzheng.modules.system.domain.vo.RouterVo;
 import com.zhongzheng.modules.top.user.domain.TopSysMenu;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
 import com.zhongzheng.modules.top.user.domain.TopSysRoleMenu;
 import com.zhongzheng.modules.top.user.mapper.TopSysMenuMapper;
 import com.zhongzheng.modules.top.user.mapper.TopSysRoleMapper;

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.constant.UserConstants;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.spring.SpringUtils;
 import com.zhongzheng.modules.top.user.domain.*;
@@ -37,7 +38,7 @@ public class TopSysRoleServiceImpl extends ServiceImpl<TopSysRoleMapper, TopSysR
 
     @Autowired
     private TopSysRoleBusinessMapper topSysRoleBusinessMapper;
-    
+
 
     /**
      * 根据条件分页查询角色数据
@@ -326,4 +327,5 @@ public class TopSysRoleServiceImpl extends ServiceImpl<TopSysRoleMapper, TopSysR
         return baseMapper.deleteBatchIds(ids);
     }
 
+
 }

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

@@ -5,6 +5,7 @@ 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.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,18 +13,22 @@ import com.github.pagehelper.Page;
 import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.domain.entity.SysRole;
+import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
+import com.zhongzheng.modules.system.domain.SysPost;
+import com.zhongzheng.modules.system.mapper.SysPostMapper;
+import com.zhongzheng.modules.system.mapper.SysRoleMapper;
 import com.zhongzheng.modules.top.user.bo.TopSysUserAddBo;
 import com.zhongzheng.modules.top.user.bo.TopSysUserEditBo;
 import com.zhongzheng.modules.top.user.bo.TopSysUserQueryBo;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
+import com.zhongzheng.modules.top.user.domain.TopSysPost;
 import com.zhongzheng.modules.top.user.domain.TopSysUserPost;
 import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
-import com.zhongzheng.modules.top.user.mapper.TopSysUserMapper;
-import com.zhongzheng.modules.top.user.mapper.TopSysUserPostMapper;
-import com.zhongzheng.modules.top.user.mapper.TopSysUserRoleMapper;
+import com.zhongzheng.modules.top.user.mapper.*;
 import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
 import com.zhongzheng.modules.top.user.service.ITopSysUserService;
 import com.zhongzheng.modules.top.user.vo.TopSysUserVo;
@@ -44,7 +49,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class TopSysUserServiceImpl extends ServiceImpl<TopSysUserMapper, TopSysUser> implements ITopSysUserService {
-    
+
     @Autowired
     private TopSysUserRoleMapper topSysUserRoleMapper;
 
@@ -53,7 +58,14 @@ public class TopSysUserServiceImpl extends ServiceImpl<TopSysUserMapper, TopSysU
 
     @Autowired
     private ITopSysRoleService iTopSysRoleService;
-    
+
+    @Autowired
+    private TopSysRoleMapper roleMapper;
+
+
+    @Autowired
+    private TopSysPostMapper postMapper;
+
 
     @Override
     public TopSysUserVo queryById(Long userId){
@@ -179,7 +191,7 @@ public class TopSysUserServiceImpl extends ServiceImpl<TopSysUserMapper, TopSysU
                 sysUser.setRoleIds(collect);
                 List<TopSysRole> sysRoles = iTopSysRoleService.listByIds(collect);
                 if (CollectionUtils.isNotEmpty(sysRoles)){
-                    List<SysRole> collect1 = sysRoles.stream().map(x -> BeanUtil.toBean(x, SysRole.class)).collect(Collectors.toList());
+                    List<TopSysRole> collect1 = sysRoles.stream().map(x -> BeanUtil.toBean(x, TopSysRole.class)).collect(Collectors.toList());
                     sysUser.setRoles(collect1);
                 }
             }else {
@@ -328,6 +340,53 @@ public class TopSysUserServiceImpl extends ServiceImpl<TopSysUserMapper, TopSysU
         return baseMapper.getRoleKeyById(loginId);
     }
 
+    @Override
+    public String selectUserRoleGroup(String userName) {
+        List<TopSysRole> list = roleMapper.selectRolesByUserName(userName);
+        StringBuffer idsStr = new StringBuffer();
+        for (TopSysRole role : list) {
+            idsStr.append(role.getRoleName()).append(",");
+        }
+        if (Validator.isNotEmpty(idsStr.toString())) {
+            return idsStr.substring(0, idsStr.length() - 1);
+        }
+        return idsStr.toString();
+    }
+
+    @Override
+    public String selectUserPostGroup(String userName) {
+        List<TopSysPost> list = postMapper.selectPostsByUserName(userName);
+        StringBuffer idsStr = new StringBuffer();
+        for (TopSysPost post : list) {
+            idsStr.append(post.getPostName()).append(",");
+        }
+        if (Validator.isNotEmpty(idsStr.toString())) {
+            return idsStr.substring(0, idsStr.length() - 1);
+        }
+        return idsStr.toString();
+    }
+
+    @Override
+    public int updateUserProfile(TopSysUser user) {
+        return baseMapper.updateById(user);
+    }
+
+    @Override
+    public int resetUserPwd(String userName, String password) {
+        return baseMapper.update(null,
+                new LambdaUpdateWrapper<TopSysUser>()
+                        .set(TopSysUser::getPassword,password)
+                        .eq(TopSysUser::getUserName,userName));
+    }
+
+    @Override
+    public boolean updateUserAvatar(String userName, String avatar) {
+        return baseMapper.update(null,
+                new LambdaUpdateWrapper<TopSysUser>()
+                        .set(TopSysUser::getAvatar,avatar)
+                        .eq(TopSysUser::getUserName,userName)) > 0;
+    }
+
 
     /**
      * 新增用户角色信息

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

@@ -111,6 +111,8 @@ public interface IUserService extends IService<User> {
 
 	Boolean updatePwd(UserAppUpdatePwdBo bo);
 
+	Boolean updatePwdByClient(UserAppUpdatePwdBo bo);
+
 	List<UserIdCardBatchVo> batchUserId(List<UserIdCardAddBo> list);
 
 	boolean editShareActivityCode(UserEditBo bo);

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

@@ -46,6 +46,7 @@ import com.zhongzheng.modules.inform.service.IInformRemindService;
 import com.zhongzheng.modules.inform.service.IInformUserService;
 import com.zhongzheng.modules.inform.vo.InformRemindBusinessVo;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.polyv.bo.PolyvLiveQueryBo;
 import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
 import com.zhongzheng.modules.user.bo.*;
@@ -748,18 +749,24 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         queryBo.setUserId(bo.getUserId());
         UserBankRecord bankVo = iUserBankRecordService.getUserLastExam(queryBo);
         if(Validator.isEmpty(vo)&&Validator.isNotEmpty(bankVo)){
-            vo = new SectionStudyRecordVo();
-            vo.setOrderGoodsId(bankVo.getOrderGoodsId());
+            vo = mergeToData(bankVo);
         }
         if(Validator.isNotEmpty(vo)&&Validator.isNotEmpty(bankVo)){
             if(vo.getUpdateTime().longValue()<bankVo.getUpdateTime().longValue()){
-                vo = new SectionStudyRecordVo();
-                vo.setOrderGoodsId(bankVo.getOrderGoodsId());
+                vo = mergeToData(bankVo);
+
             }
         }
         return vo;
     }
 
+    private SectionStudyRecordVo mergeToData(UserBankRecord bankVo){
+        SectionStudyRecordVo vo = BeanUtil.toBean(bankVo, SectionStudyRecordVo.class);
+        vo.setLearning((long)bankVo.getReportStatus());
+        vo.setExamType(bankVo.getType());
+        return vo;
+    }
+
 
     //判断当前未看完的节是否是点击播放的节
     private boolean compareSection(UserStudyRecordVo recordVo,UserStudyRecordQueryBo entity){