he2802 2 years ago
parent
commit
5e7820164c

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

@@ -204,7 +204,7 @@ public class UserController extends BaseController {
     public AjaxResult<Boolean> checkBindOpenId(@RequestBody WxIdBody loginBody)
     {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
-        UserVo userVo = iUserService.queryById(loginUser.getUser().getUserId());
+        loginBody.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success("成功",wxLoginService.checkBindOpenId(loginBody));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -197,4 +197,6 @@ public class GoodsAddBo {
     /** 班级类型 1基础班 2强化班 3私塾班 */
     @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
     private Integer gradeType;
+    @ApiModelProperty("商品试卷限制终端学习,多个,拼接  1公众号 2小程序")
+    private String examLimitClient;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -231,4 +231,6 @@ public class GoodsEditBo {
     /** 班级类型 1基础班 2强化班 3私塾班 */
     @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
     private Integer gradeType;
+    @ApiModelProperty("商品试卷限制终端学习,多个,拼接  1公众号 2小程序")
+    private String examLimitClient;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -163,4 +163,7 @@ private static final long serialVersionUID=1L;
     private Long questionMerchantId;
     /** 第三方题库商品ID */
     private Long questionGoodsId;
+    /** 商品试卷限制终端学习,多个,拼接  1公众号 2小程序 */
+    @TableField(updateStrategy=FieldStrategy.IGNORED)
+    private String examLimitClient;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -366,5 +366,7 @@ public class GoodsVo {
 	private Integer gradeType;
 	@ApiModelProperty("官方班级名称")
 	private String officialName;
+	@ApiModelProperty("商品试卷限制终端学习,多个,拼接  1公众号 2小程序")
+	private String examLimitClient;
 
 }

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

@@ -54,6 +54,7 @@
         <result property="commitPeriodStatus" column="commit_period_status"/>
         <result property="commitPeriodRemark" column="commit_period_remark"/>
         <result property="gradeType" column="grade_type"/>
+        <result property="examLimitClient" column="exam_limit_client"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
@@ -141,6 +142,7 @@
         <result property="commitPeriodStatus" column="commit_period_status"/>
         <result property="commitPeriodRemark" column="commit_period_remark"/>
         <result property="gradeType" column="grade_type"/>
+        <result property="examLimitClient" column="exam_limit_client"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">