fix短信

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

@@ -210,5 +210,5 @@ public class GoodsAddBo {
     private Long minClassHour;
     /** 优选生成商品 0否 1是 */
     @ApiModelProperty("优选生成商品 0否 1是")
-    private Integer firstChoiceGoods;
+    private Long firstChoiceGoods;
 }

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

@@ -244,5 +244,5 @@ public class GoodsEditBo {
     private Long minClassHour;
     /** 优选生成商品 0否 1是 */
     @ApiModelProperty("优选生成商品 0否 1是")
-    private Integer firstChoiceGoods;
+    private Long firstChoiceGoods;
 }

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

@@ -175,5 +175,5 @@ private static final long serialVersionUID=1L;
     /** 优选至少学习学时 */
     private Long minClassHour;
     /** 优选生成商品 0否 1是 */
-    private Integer firstChoiceGoods;
+    private Long firstChoiceGoods;
 }

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

@@ -387,7 +387,7 @@ public class GoodsVo {
 	/** 优选生成商品 0否 1是 */
 	@Excel(name = "优选生成商品 0否 1是")
 	@ApiModelProperty("优选生成商品 0否 1是")
-	private Integer firstChoiceGoods;
+	private Long firstChoiceGoods;
 	@ApiModelProperty("业务别名")
 	private String aliasName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java

@@ -93,4 +93,6 @@ private static final long serialVersionUID=1L;
 
     /** 企业ID */
     private Long tenantId;
+
+    private Long firstChoiceGrade;
 }

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

@@ -54,6 +54,7 @@ import com.zhongzheng.modules.goods.vo.GoodsSectionListVo;
 import com.zhongzheng.modules.goods.vo.GoodsSectionNumVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeGoodsAddBo;
+import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
@@ -948,6 +949,19 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         if(Validator.isEmpty(orderGoods)||orderGoods.getGoodsId().longValue()!=bo.getGoodsId().longValue()||orderGoods.getGradeId().longValue()!=bo.getGradeId().longValue()){
             throw new CustomException("订单商品数据错误");
         }
+        ClassGrade gradeOld = iClassGradeService.getOne(new LambdaQueryWrapper<ClassGrade>()
+                .eq(ClassGrade::getGradeId, bo.getGradeId()));
+        ClassGrade gradeNew = BeanUtil.toBean(gradeOld, ClassGrade.class);
+        gradeNew.setGradeId(null);
+        gradeNew.setFirstChoiceGrade(gradeOld.getGradeId());
+        gradeNew.setCreateTime(DateUtils.getNowTime());
+        gradeNew.setUpdateTime(DateUtils.getNowTime());
+        gradeNew.setGradeCode(ServletUtils.getEncoded("BJ"));
+        gradeNew.setClassName(gradeNew.getClassName()+"(优选)");
+        iClassGradeService.save(gradeNew);
+
+
+
         Course courseOld =courseMapper.selectOne(new LambdaQueryWrapper<Course>()
                 .eq(Course::getCourseId, bo.getCourseId()));
         Course courseNew = BeanUtil.toBean(courseOld, Course.class);
@@ -980,7 +994,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         goodsNew.setCreateTime(DateUtils.getNowTime());
         goodsNew.setUpdateTime(DateUtils.getNowTime());
         goodsNew.setCode(ServletUtils.getEncoded("KC"));
-        goodsNew.setFirstChoiceGoods(1);
+        goodsNew.setFirstChoiceGoods(bo.getGoodsId());
         goodsNew.setFirstChoiceStatus(0);
         goodsNew.setCode(ServletUtils.getEncoded("SP"));
         goodsNew.setGoodsName(goodsNew.getGoodsName()+"(优选)");
@@ -997,11 +1011,12 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         iGoodsCourseService.save(goodsCourseNew);
 
         orderGoods.setGoodsId(goodsNew.getGoodsId());
+        orderGoods.setGradeId(gradeNew.getGradeId());
         updateById(orderGoods);
 
         ClassGradeGoodsAddBo gradeGoodsAddBo = new ClassGradeGoodsAddBo();
         gradeGoodsAddBo.setGoodsId(goodsNew.getGoodsId());
-        gradeGoodsAddBo.setGradeId(orderGoods.getGradeId());
+        gradeGoodsAddBo.setGradeId(gradeNew.getGradeId());
         iClassGradeGoodsService.insertByAddBo(gradeGoodsAddBo);
 
         LambdaUpdateWrapper<UserExamGoods> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
@@ -1016,6 +1031,13 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         objectLambdaUpdateWrapper2.set(UserExamGoodsSupplement::getUpdateTime,DateUtils.getNowTime());
         iUserExamGoodsSupplementService.update(null, objectLambdaUpdateWrapper2);
 
+        LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper3 = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper3.eq(ClassGradeUser::getOrderGoodsId, bo.getOrderGoodsId());
+        objectLambdaUpdateWrapper3.eq(ClassGradeUser::getUserId, bo.getUserId());
+        objectLambdaUpdateWrapper3.set(ClassGradeUser::getGradeId, gradeNew.getGradeId());
+        objectLambdaUpdateWrapper3.set(ClassGradeUser::getUpdateTime,DateUtils.getNowTime());
+        iClassGradeUserService.update(null, objectLambdaUpdateWrapper3);
+
         bo.setGoodsId(goodsNew.getGoodsId());
         bo.setCourseId(goodsCourseNew.getCourseId());
         return bo;