submit

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

@@ -7,12 +7,10 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.tencentcloudapi.cme.v20191029.models.VideoEditTemplateMaterial;
 import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
 import com.zhongzheng.modules.bank.mapper.QuestionMapper;
 import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuListAddBo;
@@ -882,7 +880,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             subjectStudyRecordQueryBo.setUserId(user.getUserId());
             subjectStudyRecordQueryBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
             subjectStudyRecordQueryBo.setGradeId(goodsVo.getGradeId());
-            subjectStudyRecordQueryBo.setTenantId(goodsVo.getTrainOrgId());
+            subjectStudyRecordQueryBo.setTenantId(goodsVo.getTenantId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubjectTenant(subjectStudyRecordQueryBo);
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
@@ -895,7 +893,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             if (goodsVo.getCourseType() == 1) {
                 //视频商品
                 //获得当前所在班级
-                ClassGradeVo classGradeVo = courseMapper.gradeIdSelectTenant(user.getUserId(), goodsVo.getGoodsId(), goodsVo.getGradeId(),goodsVo.getTrainOrgId());
+                ClassGradeVo classGradeVo = courseMapper.gradeIdSelectTenant(user.getUserId(), goodsVo.getGoodsId(), goodsVo.getGradeId(),goodsVo.getTenantId());
                 if (ObjectUtils.isNotNull(classGradeVo)) {
                     goodsVo.setPeriodStatus(classGradeVo.getPeriodStatus());
                 }
@@ -915,12 +913,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             //获取小程序appID
             SysConfig sysConfig = iSysConfigService.getOne(new LambdaQueryWrapper<SysConfig>()
                     .eq(SysConfig::getConfigKey, "wx.small.appid")
-                    .eq(SysConfig::getTenantId, goodsVo.getTrainOrgId()));
+                    .eq(SysConfig::getTenantId, goodsVo.getTenantId()));
             if (ObjectUtils.isNull(sysConfig)){
                 throw new CustomException("获取小程序appId失败");
             }
             //课程
-            List<Long> courseIds = iGoodsCourseService.getCourseIdsByGoodsAndTenant(goodsVo.getGoodsId(),goodsVo.getTrainOrgId());
+            List<Long> courseIds = iGoodsCourseService.getCourseIdsByGoodsAndTenant(goodsVo.getGoodsId(),goodsVo.getTenantId());
             if (CollectionUtils.isNotEmpty(courseIds) && courseIds.size() == 1){
                 goodsVo.setCourseId(courseIds.get(0));
             }

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

@@ -42,7 +42,7 @@ public class UserGoodsListVo implements Serializable {
     private String majorName;
 
     @ApiModelProperty("机构id")
-    private Long trainOrgId;
+    private Long tenantId;
 
     @ApiModelProperty("课程学习类型，1只有视频，2视频+题库，3只有题库，4直播课程")
     private Integer courseType;

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -701,7 +701,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             o.order_id as orderId,
             g.goods_name as categoryName,
             m.category_name as majorName,
-            o.tenant_id as trainOrgId,
+            o.tenant_id as tenantId,
             g.goods_type as courseType,
             concat('https://file-dev.xyyxt.net/', g.cover_url) as imageUrl,
             o.create_time as createTimeStr,