Merge branch 'dev' into pre

run-prod.sh

@@ -1,41 +1,4 @@
-#!/usr/bin/env bash
-# 定义应用组名
-group_name='zhongzheng'
-# 定义应用名称
-app_name='zhongzheng-saas-api'
-# 定义应用版本
-app_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
-docker run -p 5055:5055 --name ${app_name} \
---restart=always \
--e 'spring.profiles.active'=${profile_active} \
--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 \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
 
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
 
 #!/usr/bin/env bash
 # 定义应用组名

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/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/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-prod.yml

@@ -153,5 +153,19 @@ Nuonuo:
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
 
+oldOrder:
+    studyRecord: http://www.xyyxt.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://www.xyyxt.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://www.xyyxt.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://www.xyyxt.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://www.xyyxt.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://www.xyyxt.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: https://cloud.xyyxt.net/common/platform/pay
+    refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
+
 oldSys:
     host: https://www.xyyxt.net
+
+invoice:
+    host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log

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

@@ -153,5 +153,19 @@ Nuonuo:
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
 
+oldOrder:
+    studyRecord: http://www.xyyxt.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://www.xyyxt.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://www.xyyxt.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://www.xyyxt.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://www.xyyxt.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://www.xyyxt.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: https://cloud.xyyxt.net/common/platform/pay
+    refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
+
 oldSys:
     host: http://test.jqbao.net
+
+invoice:
+    host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log

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

@@ -131,6 +131,17 @@ public class UserStudyRecordController extends BaseController {
         return AjaxResult.success(iUserStudyRecordService.menuAllList(bo));
     }
 
+    /**
+     * 查询课程目录结构列表
+     */
+    @ApiOperation("查询课程所有子目录带试卷结构列表")
+    @GetMapping("/menuAllListWithExam")
+    public AjaxResult<List<ClassPeriodVo>> menuAllListWithExam(UserStudyRecordQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iUserStudyRecordService.menuAllListWithExam(bo));
+    }
+
     @ApiOperation("查询用户每天学习记录列表")
     @GetMapping("/listUserRecord")
     public TableDataInfo<SectionStudyRecordVo> listUserRecord(UserStudyRecordQueryBo bo) {

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

@@ -165,5 +165,19 @@ Nuonuo:
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
 
+oldOrder:
+    studyRecord: http://www.xyyxt.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://www.xyyxt.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://www.xyyxt.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://www.xyyxt.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://www.xyyxt.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://www.xyyxt.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: https://cloud.xyyxt.net/common/platform/pay
+    refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
+
 oldSys:
     host: http://test.jqbao.net
+
+invoice:
+    host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log

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-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/grade/vo/ClassPeriodVo.java

@@ -113,8 +113,8 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 
 
 	/** 1模块 2章 3节 4卷 */
-	@Excel(name = "1模块 2章 3节 4卷")
-	@ApiModelProperty("1模块 2章 3节 4卷")
+	@Excel(name = "1模块 2章 3节 4章卷 5模块卷")
+	@ApiModelProperty("1模块 2章 3节 4章卷 5模块卷")
 	private Long type;
 
 	/** 當前位置 */
@@ -206,6 +206,9 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	private Long endTotalTime;
 
 	private Long secTotalTime;
+
+	@ApiModelProperty("试卷ID")
+	private Long examId;
 	@Override
 	public int compareTo(ClassPeriodVo o) {
 		if(o.getCourseSort()==this.getCourseSort()){

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformRemindRelevance.java

@@ -37,4 +37,6 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
 
     private Long tenantId;
+    /** 关联类型：1云学堂后台 2中正总平台 */
+    private Long relevanceType;
 }

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

@@ -109,4 +109,6 @@ public class OrderInvoiceAddBo {
     private Long periodTime;
     @ApiModelProperty("订单商品ID数组")
     private List<Long> orderGoodsIds;
+    @ApiModelProperty("发票备注")
+    private String invoiceRemark;
 }

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

@@ -40,4 +40,6 @@ public class OrderInvoiceBo implements Serializable {
     private String SalerAddress = "广东省广州市天河区燕岭路123号3楼";
 
     private OrderInvoiceDetailBo invoiceDetail;
+
+    private String remark;
 }

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
@@ -496,7 +497,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         List<OrderUserGoodsVo> allList = new ArrayList<>();
         for(String tel : bo.getTel()){
             User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone,tel).last("limit 1"));
+                    .eq(User::getTelphone, EncryptHandler.encrypt(tel)).last("limit 1"));
             if(Validator.isNull(user)){
                 OrderUserGoodsVo goodsBo = new OrderUserGoodsVo();
                 goodsBo.setTel(tel);

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

@@ -151,6 +151,7 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
         String invoiceOrderSn = DateUtils.getInvoiceOrderSn();
         invoiceBo.setOrderNo(invoiceOrderSn);
         invoiceBo.setInvoiceDate(DateUtils.timestampToDateFormat(DateUtils.getNowTime(),"yyyy-MM-dd HH:mm:ss"));
+        invoiceBo.setRemark(bo.getInvoiceRemark());
         if (bo.getSubject() == 1){
             //个人
             invoiceBo.setBuyerName(bo.getInvoiceTitle());
@@ -183,6 +184,7 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
         params.put("sign", sign);
         params.put("content", JSONObject.toJSONString(hostBo));
         params.put("orderNo", invoiceOrderSn);
+        params.put("fromPlat", "1");
         params.put("tenantId", ServletUtils.getRequest().getHeader("TenantId"));
         String respone = "";
         try {

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

@@ -1047,8 +1047,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     }
 
                     if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
-                            || (price.compareTo(x.getMinValue()) > 0 && price.compareTo(x.getMaxValue()) < 0)
-                            || (price.compareTo(x.getMinValue()) == 0 && price.compareTo(x.getMaxValue()) == 0)){
+                            || (price.compareTo(x.getMinValue()) > 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) < 0))
+                            || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))){
                         tpItems.add(x);
                     }
                 }

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

@@ -96,4 +96,10 @@ public class TopDivideOrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("角色ID")
 	private Long roleId;
+
+	@ApiModelProperty("起始金额")
+	private BigDecimal startPrice;
+
+	@ApiModelProperty("结束金额")
+	private BigDecimal endPrice;
 }

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

@@ -38,4 +38,6 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    /** 关联类型：1云学堂后台 2中正总平台 */
+    private Integer relevanceType;
 }

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

@@ -100,4 +100,10 @@ public class TopDivideOrderVo {
 
 	@ApiModelProperty("订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单 ")
 	private Integer orderFrom;
+	@ApiModelProperty("角色ID")
+	private Long roleId;
+	@ApiModelProperty("订单标准价格(合同金额)")
+	private BigDecimal orderPrice;
+	@ApiModelProperty("税前佣金")
+	private BigDecimal pretaxBrokerage;
 }

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

@@ -185,4 +185,7 @@ public class TopOldOrderAddBo {
 
     @ApiModelProperty("下单企业")
     private String purchaseOrg;
+
+    @ApiModelProperty("是否需要完单标识：0不需要，1需要")
+    private Integer finishSign;
 }

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

@@ -87,4 +87,8 @@ public class TopOldOrderGoodsAddBo {
     private String userCard;
     @ApiModelProperty("学员手机号码")
     private String userPhone;
+    @ApiModelProperty("分成模式 1机构分成 2业务员分成")
+    private Integer divideModel;
+    @ApiModelProperty("分成钱")
+    private BigDecimal divideMoney;
 }

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

@@ -150,4 +150,6 @@ private static final long serialVersionUID=1L;
     private Long creditTime;
     /** 下单企业 */
     private String purchaseOrg;
+    /** 是否需要完单标识：0不需要，1需要 */
+    private Integer finishSign;
 }

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/impl/TopCourseProjectTypeServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -90,16 +91,12 @@ public class TopCourseProjectTypeServiceImpl extends ServiceImpl<TopCourseProjec
         TopCourseProjectType update = BeanUtil.toBean(bo, TopCourseProjectType.class);
         //判断是否有重复命名
         if (bo.getStatus() != -1) {
-            TopCourseProjectTypeQueryBo courseProjectTypeQueryBo = new TopCourseProjectTypeQueryBo();
-            courseProjectTypeQueryBo.setProjectName(bo.getProjectName());
-            courseProjectTypeQueryBo.setEducationId(bo.getEducationId());
-            courseProjectTypeQueryBo.setId(bo.getId());
-            List<Integer> longs = new ArrayList<>();
-            longs.add(1);
-            longs.add(0);
-            courseProjectTypeQueryBo.setStatus(longs);
-            Collection<TopCourseProjectTypeVo> courseProjectTypeVos = baseMapper.queryList(courseProjectTypeQueryBo);
-            if (CollectionUtils.isEmpty(courseProjectTypeVos)) {
+            List<TopCourseProjectType> topCourseProjectTypes = baseMapper.selectList(new LambdaQueryWrapper<TopCourseProjectType>()
+                    .eq(TopCourseProjectType::getProjectName, bo.getProjectName())
+                    .eq(TopCourseProjectType::getEducationId, bo.getEducationId())
+                    .eq(TopCourseProjectType::getId, bo.getId())
+                    .in(TopCourseProjectType::getStatus, Arrays.asList(0, 1)));
+            if (CollectionUtils.isEmpty(topCourseProjectTypes)) {
                 validEntityBeforeSave(update);
             }
         }

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())

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

@@ -237,6 +237,9 @@ public class TopOldOrderVo {
 	@ApiModelProperty("退款审核角色名称")
 	private String refundName;
 
+	@ApiModelProperty("退款审核角色ID")
+	private Long refundRoleId;
+
 	@ApiModelProperty("审核进度")
 	private List<TopOldOrderCheckLogVo> checkLogVos;
 
@@ -273,4 +276,10 @@ public class TopOldOrderVo {
 
 	@ApiModelProperty("下单企业")
 	private String purchaseOrg;
+
+	@ApiModelProperty("审核标识：0审核，1不审核")
+	private Integer commercialTenant;
+
+	@ApiModelProperty("是否需要完单标识：0不需要，1需要")
+	private Integer finishSign;
 }

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;

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/TopSysUserRoleMapper.java

@@ -3,7 +3,7 @@ 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.modules.top.user.domain.TopSysRole;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
 
 import java.util.List;

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

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.top.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.common.core.domain.entity.SysRole;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 
 import java.util.List;
 import java.util.Set;

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.*;

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

@@ -14,6 +14,7 @@ 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;
@@ -25,7 +26,6 @@ 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.TopSysPost;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
 import com.zhongzheng.modules.top.user.domain.TopSysUserPost;
 import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
 import com.zhongzheng.modules.top.user.mapper.*;
@@ -191,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 {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordAddBo.java

@@ -92,5 +92,5 @@ public class UserStudyRecordAddBo {
     /** 相似度 */
     @ApiModelProperty("相似度")
     private Integer similarity;
-
+    private Boolean erJianErZao;
 }

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

@@ -95,6 +95,8 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 
 	List<ClassPeriodVo> menuAllList(UserStudyRecordQueryBo bo);
 
+	List<ClassPeriodVo> menuAllListWithExam(UserStudyRecordQueryBo bo);
+
 	List<SectionStudyRecordVo> listUserRecord(UserStudyRecordQueryBo bo);
 
 	Integer getStudyStatus(ClassPeriodVo bo);

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

@@ -34,12 +34,11 @@ import com.zhongzheng.modules.grade.bo.UserPeriodQueryBo;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.domain.UserPeriod;
 import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
+import com.zhongzheng.modules.grade.mapper.ClassGradeUserMapper;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
 import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
-import com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo;
-import com.zhongzheng.modules.grade.vo.ClassPeriodVo;
-import com.zhongzheng.modules.grade.vo.UserPeriodStatusVo;
+import com.zhongzheng.modules.grade.vo.*;
 import com.zhongzheng.modules.inform.bo.InformRemindQueryBo;
 import com.zhongzheng.modules.inform.bo.InformUserAddBo;
 import com.zhongzheng.modules.inform.service.IInformRemindService;
@@ -151,6 +150,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Autowired
     private ICourseMenuExamService courseMenuExamService;
 
+    @Autowired
+    private ClassGradeUserMapper classGradeUserMapper;
+
     @Override
     public UserStudyRecordVo queryById(Long recordId) {
         UserStudyRecord db = this.baseMapper.selectById(recordId);
@@ -215,6 +217,10 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             vo.setSectionType(sectionVo.getSectionType());
             vo.setLiveUrl(sectionVo.getLiveUrl());
             vo.setRecordingUrl(sectionVo.getRecordingUrl());
+            Integer learning = courseChapterSectionMapper.learningCheck(vo.getSectionId(), vo.getGradeId(), bo.getUserId(), vo.getModuleId(), vo.getChapterId(), 0L,vo.getCourseId());
+            if (learning > 0) {
+                vo.setLearning(1L);
+            }
         }
         return vo;
     }
@@ -428,7 +434,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             UserStudyRecordVo lastVo = queryLast(queryBo);
             if(Validator.isEmpty(lastVo)||Validator.isNotEmpty(bo.getPhoto())||Validator.isEmpty(lastVo.getVideoCurrentTime())||lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue()){
                 //如果没有历史数据或者之前播放时长比现在晚，或者携带照片则新增观看记录
-                this.save(add);
+                if(Validator.isNotEmpty(lastVo)&&Validator.isNotEmpty(bo.getErJianErZao())&&bo.getErJianErZao()&&Validator.isEmpty(bo.getPhoto())&&(lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue())){
+                    return 0;
+                }else{
+                    this.save(add);
+                }
             }else{
                 if(Validator.isNotEmpty(add.getStatus())&&add.getStatus()==1){
                     lastVo.setStatus(1);
@@ -672,6 +682,92 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         return sectionList;
     }
 
+    @Override
+    public List<ClassPeriodVo> menuAllListWithExam(UserStudyRecordQueryBo bo) {
+        //存储整个目录节列表
+        List<ClassPeriodVo> sectionList = new ArrayList<>();
+        //获取课程目录
+        List<ClassPeriodVo> list = baseMapper.listMenu(bo);
+        //排序目录
+        Collections.sort(list);
+        for (ClassPeriodVo classPeriodVo : list) {
+            //为模块搜索下面的章 和节
+            if (classPeriodVo.getType() == 1){
+                UserStudyRecordQueryBo moduleQueryBo = new UserStudyRecordQueryBo();
+                moduleQueryBo.setModuleId(classPeriodVo.getId());
+                List<ClassPeriodVo> classPeriodChapterVos = baseMapper.listModuleChapter(moduleQueryBo);
+                //排序章目录
+                Collections.sort(classPeriodChapterVos);
+                for (ClassPeriodVo classChapterVo : classPeriodChapterVos) {
+                    UserStudyRecordQueryBo chapterQueryBo = new UserStudyRecordQueryBo();
+                    chapterQueryBo.setChapterId(classChapterVo.getId());
+                    List<ClassPeriodVo> classPeriodSectionVos = baseMapper.listChapterSection(chapterQueryBo);
+                    //排序节目录
+                    Collections.sort(classPeriodSectionVos);
+                    for (ClassPeriodVo classSectionVo : classPeriodSectionVos) {
+                        classSectionVo.setModuleId(classPeriodVo.getId());
+                        classSectionVo.setChapterId(classChapterVo.getId());
+                        classSectionVo.setSectionId(classSectionVo.getId());
+                        classSectionVo.setType(3L);
+                        sectionList.add(classSectionVo);
+                    }
+                    List<ClassPeriodSectionVo> cExamList= classGradeUserMapper.listperiodExam(classChapterVo.getId(), null, classPeriodVo.getCourseId(), null, classPeriodVo.getId());
+                    for (ClassPeriodSectionVo sectionVo : cExamList) {
+                        ClassPeriodVo classSectionVo = BeanUtil.toBean(sectionVo,ClassPeriodVo.class);
+                        classSectionVo.setType(4L);
+                        classSectionVo.setExamId(sectionVo.getId());
+                        sectionList.add(classSectionVo);
+                    }
+                }
+                List<ClassPeriodChapterVo> mExamList =  classGradeUserMapper.listperiodModuleExam( null, classPeriodVo.getCourseId(), null, classPeriodVo.getId());
+                for (ClassPeriodChapterVo chapterVo : mExamList) {
+                    ClassPeriodVo classSectionVo = BeanUtil.toBean(chapterVo,ClassPeriodVo.class);
+                    classSectionVo.setType(5L);
+                    classSectionVo.setExamId(chapterVo.getId());
+                    sectionList.add(classSectionVo);
+                }
+            }
+            //为章搜索节记录
+            if (classPeriodVo.getType() == 2){
+                UserStudyRecordQueryBo chapterQueryBo = new UserStudyRecordQueryBo();
+                chapterQueryBo.setChapterId(classPeriodVo.getId());
+                List<ClassPeriodVo> classPeriodSectionVos = baseMapper.listChapterSection(chapterQueryBo);
+                //排序节目录
+                Collections.sort(classPeriodSectionVos);
+                for (ClassPeriodVo classSectionVo : classPeriodSectionVos) {
+                    classSectionVo.setModuleId(0L);
+                    classSectionVo.setChapterId(classPeriodVo.getId());
+                    classSectionVo.setSectionId(classSectionVo.getId());
+                    classSectionVo.setType(3L);
+                    sectionList.add(classSectionVo);
+                }
+                List<ClassPeriodSectionVo> cExamList= classGradeUserMapper.listperiodExam(classPeriodVo.getId(), null, classPeriodVo.getCourseId(), null, 0L);
+                for (ClassPeriodSectionVo sectionVo : cExamList) {
+                    ClassPeriodVo classSectionVo = BeanUtil.toBean(sectionVo,ClassPeriodVo.class);
+                    classSectionVo.setType(4L);
+                    classSectionVo.setExamId(sectionVo.getId());
+                    sectionList.add(classSectionVo);
+                }
+
+            }
+            //为节搜索学时记录
+            if (classPeriodVo.getType() == 3){
+                classPeriodVo.setModuleId(0L);
+                classPeriodVo.setChapterId(0L);
+                classPeriodVo.setSectionId(classPeriodVo.getId());
+                sectionList.add(classPeriodVo);
+            }
+        }
+        for(ClassPeriodVo section : sectionList){
+            section.setGoodsId(bo.getGoodsId());
+            section.setGradeId(bo.getGradeId());
+            section.setUserId(bo.getUserId());
+            section.setCourseId(bo.getCourseId());
+            section.setStudyStatus(baseMapper.getStudyStatus(section));
+        }
+        return sectionList;
+    }
+
     @Override
     public List<SectionStudyRecordVo> listUserRecord(UserStudyRecordQueryBo bo) {
         return this.baseMapper.listUserRecord(bo);

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

@@ -122,4 +122,6 @@ public class UserStudyRecordVo {
 	@Excel(name = "访问IP")
 	@ApiModelProperty("访问IP")
 	private String ip;
+	@ApiModelProperty("1已学习")
+	private Long learning;
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -26,8 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             oo.divide_company_money,
             oo.divide_seller_money,
             oo.brokerage,
+            oo.pretax_brokerage,
+            oo.order_price,
             oo.order_from,
-            r.role_name
+            r.role_name,
+            r.role_id
         FROM
             top_divide_order tdo
                 LEFT JOIN top_divide_log dl ON tdo.divide_log_id = dl.id
@@ -39,8 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             tdo.order_type = 1
           AND tdo.divide_log_id = #{divideLogId}
-        <if test="roleId != null and roleId != ''">
-            AND cl.role_id = #{roleId}
+        <if test="startPrice != null and startPrice != ''">
+            AND (oo.order_price - oo.pretax_brokerage) <![CDATA[ >= ]]> #{startPrice}
+        </if>
+        <if test="endPrice != null and endPrice != ''">
+            AND (oo.order_price - oo.pretax_brokerage) <![CDATA[ <= ]]> #{endPrice}
         </if>
     </select>
 
@@ -50,7 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             st.tenant_name,
             dl.pay_status,
             dl.divide_type,
-               oo.remark,
+            oo.remark,
+            oo.order_price,
+            oo.brokerage,
+            oo.pretax_brokerage,
             tor.divide_money,
             tor.refund_time as order_time
         FROM
@@ -62,6 +71,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             tdo.order_type = 2
           AND tdo.divide_log_id = #{divideLogId}
+        <if test="startPrice != null and startPrice != ''">
+            AND (oo.order_price - oo.pretax_brokerage) <![CDATA[ >= ]]> #{startPrice}
+        </if>
+        <if test="endPrice != null and endPrice != ''">
+            AND (oo.order_price - oo.pretax_brokerage) <![CDATA[ <= ]]> #{endPrice}
+        </if>
     </select>
 
     <select id="getMonthFinishAllTenant" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="String">

zhongzheng-system/src/main/resources/mapper/modules/top/TopSysRoleMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhongzheng.modules.top.user.mapper.TopSysRoleMapper">
 
-    <resultMap type="com.zhongzheng.modules.top.user.domain.TopSysRole" id="TopSysRoleResult">
+    <resultMap type="com.zhongzheng.common.core.domain.entity.TopSysRole" id="TopSysRoleResult">
         <result property="roleId" column="role_id"/>
         <result property="roleName" column="role_name"/>
         <result property="roleKey" column="role_key"/>

zhongzheng-system/src/main/resources/mapper/modules/top/TopSysUserMapper.xml

@@ -23,6 +23,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <collection property="roles" column="user_id" select="findRolesList" javaType="java.util.List" />
+    </resultMap>
+
+    <select id="findRolesList" resultMap="RoleResult">
+        SELECT
+            r.role_id,
+            r.role_name,
+            r.data_scope,
+            r.role_key
+        FROM
+            top_sys_user_role ur
+                LEFT JOIN top_sys_role r ON r.role_id = ur.role_id
+        where  ur.user_id =#{user_id}
+    </select>
+
+
+
+    <resultMap id="RoleResult" type="TopSysRole">
+        <id property="roleId" column="role_id"/>
+        <result property="roleName" column="role_name"/>
+        <result property="roleKey" column="role_key"/>
+        <result property="roleSort" column="role_sort"/>
+        <result property="dataScope" column="data_scope"/>
+        <result property="status" column="role_status"/>
     </resultMap>
 
     <sql id="selectTopUserVo">
@@ -41,23 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                u.login_date,
                u.create_by,
                u.create_time,
-               u.remark,
-               d.dept_id,
-               d.parent_id,
-               d.dept_name,
-               d.order_num,
-               d.leader,
-               d.status as dept_status,
-               r.role_id,
-               r.role_name,
-               r.role_key,
-               r.role_sort,
-               r.data_scope,
-               r.status as role_status
+               u.remark
+
         from top_sys_user u
-                 left join top_sys_dept d on u.dept_id = d.dept_id
-                 left join top_sys_user_role ur on u.user_id = ur.user_id
-                 left join top_sys_role r on r.role_id = ur.role_id
+
     </sql>
 
 

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -278,18 +278,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="hasBindWx != null and hasBindWx == 0 ">
             AND u.union_id is null
         </if>
-        <if test="hasFollowWx != null and hasFollowWx == 1 ">
-            AND uwf.gzh_open_id is not null
-        </if>
-        <if test="hasFollowWx != null and hasFollowWx == 0 ">
-            AND uwf.gzh_open_id is null
-        </if>
-        <if test="lastVisitPlat != null ">
-            AND uvl.visit_from_plat = #{lastVisitPlat}
-        </if>
-        <if test="lastStudyPlat != null ">
-            AND usl.study_from_plat = #{lastStudyPlat}
-        </if>
         <if test="visitStartTime != null and visitStartTime !=''">
             and (SELECT
             count(*)