fix 资料商品

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

@@ -48,6 +48,8 @@ public class UserController extends BaseController {
 
     private final WxTokenService wxTokenService;
 
+
+
     /**
      * 修改客户端用户
      */

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

@@ -198,7 +198,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             payPrice = payPrice.add(g.getGoodsPrice());
             //视频商品安排班级
             if(goods.getGoodsType()==1&&orderGoodsRs){
-                arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),g.getGoodsInputData().getGradeId(),add.getUserId());
+                Long gradeId = null;
+                if(g.getGoodsInputData()!=null){
+                    gradeId = g.getGoodsInputData().getGradeId();
+                }
+                arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId());
             }
         }
 
@@ -247,6 +251,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      * @return
      */
     public boolean arrangeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId){
+        System.out.println("进入创建班级"+gradeId);
         //指定班级
         if(gradeId!=null){
             ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
@@ -283,6 +288,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
         classGrade.setCreateTime(DateUtils.getNowTime());
         classGrade.setUpdateTime(DateUtils.getNowTime());
+        classGrade.setStatus(1);
         String gradeCode = ServletUtils.getEncoded("BJ");
         classGrade.setGradeCode(gradeCode);
         classGrade.setClassName(goodsName+gradeCode);
@@ -293,6 +299,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     public boolean joinGrade(Long orderGoodsId,Long gradeId,Long userId){
+        System.out.println("加入班级"+gradeId);
         //进入班级
         ClassGradeUser classGradeUser = new ClassGradeUser();
         classGradeUser.setUserId(userId);
@@ -301,11 +308,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         classGradeUser.setCreateBy(SecurityUtils.getUsername());
         classGradeUser.setFromType(1);
         classGradeUser.setOrderGoodsId(orderGoodsId);
+        classGradeUser.setCreateTime(DateUtils.getNowTime());
+        classGradeUser.setUpdateTime(DateUtils.getNowTime());
         iClassGradeUserService.save(classGradeUser);
         //更新订单绑定班级ID
         OrderGoods orderGoods = new OrderGoods();
         orderGoods.setOrderGoodsId(orderGoodsId);
         orderGoods.setGradeId(gradeId);
+        orderGoods.setUpdateTime(DateUtils.getNowTime());
         iOrderGoodsService.updateById(orderGoods);
         return true;
     }