fix

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

@@ -376,11 +376,24 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if(Validator.isEmpty(userVo)){
             throw new CustomException("用户不存在");
         }
+        if(Validator.isEmpty(userVo.getInterfacePushId())||userVo.getInterfacePushId().equals(1L)){
+            throw new CustomException("没开通信息推送");
+        }
+        if(Validator.isEmpty(userVo.getInterfacePushId())||userVo.getInterfacePushId().equals(1L)){
+            throw new CustomException("没开通信息推送");
+        }
+        if(Validator.isEmpty(userVo.getClassName())){
+            throw new CustomException("没配置班号");
+        }
+        if(Validator.isEmpty(userVo.getClassStatus())||userVo.getClassStatus()!=1){
+            throw new CustomException("未开班");
+        }
+
 
         Map<String, String> params =  new HashMap<>();
         params.put("zh",OFFICIALPUSH_INFOACCOUNT);
-        params.put("bh",userVo.getCode());
-        params.put("xm","何建林");
+        params.put("bh",userVo.getClassName());
+        params.put("xm",userVo.getRealName());
         params.put("sfz",userVo.getIdCard());
         params.put("dh",userVo.getTelPhone());
         params.put("bmrq","2022-11-11");

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserVo.java

@@ -74,4 +74,17 @@ public class ClassGradeUserVo {
 
 	@ApiModelProperty("班名称")
 	private String className;
+
+	/** 开班状态 0未开班 1开班 */
+	@Excel(name = "开班状态 0未开班 1开班")
+	@ApiModelProperty("开班状态 0未开班 1开班")
+	private Integer classStatus;
+	/** 官方班级 */
+	@Excel(name = "官方班级")
+	@ApiModelProperty("官方班级")
+	private String officialName;
+	/** 官方信息推送接口 */
+	@Excel(name = "官方信息推送接口")
+	@ApiModelProperty("官方信息推送接口")
+	private Long interfacePushId;
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -30,6 +30,9 @@
         <result property="createBy" column="create_by"/>
         <result property="telPhone" column="telphone"/>
         <result property="changeGrade" column="change_grade"/>
+        <result property="interfacePushId" column="interface_push_id"/>
+        <result property="classStatus" column="class_status"/>
+        <result property="officialName" column="official_name"/>
     </resultMap>
 
 

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -211,6 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN `order` o on og.order_sn = o.order_sn
         WHERE
             o.user_id = #{userId} and og.goods_id = #{goodsId} and og.pay_status in (2,3) and  og.order_goods_id !=  #{orderGoodsId}
-
     </select>
+
+
 </mapper>