he2802 пре 3 година
родитељ
комит
789120779d

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

@@ -12,8 +12,10 @@ import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
+import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
 import com.zhongzheng.modules.grade.domain.ClassGradeSys;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
+import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
@@ -60,6 +62,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     private IClassGradeService iClassGradeService;
     @Autowired
     private IClassGradeUserService iClassGradeUserService;
+    @Autowired
+    private IClassGradeGoodsService iClassGradeGoodsService;
 
 
     @Autowired
@@ -293,6 +297,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         classGrade.setGradeCode(gradeCode);
         classGrade.setClassName(goodsName+gradeCode);
         boolean save = iClassGradeService.save(classGrade);
+        //绑定班级商品
+        ClassGradeGoods classGradeGoods = new ClassGradeGoods();
+        classGradeGoods.setGradeId(classGrade.getGradeId());
+        classGradeGoods.setGoodsId(goodsId);
+        classGradeGoods.setCreateTime(DateUtils.getNowTime());
+        classGradeGoods.setUpdateTime(DateUtils.getNowTime());
+        iClassGradeGoodsService.save(classGradeGoods);
         //加入班级
         joinGrade(orderGoodsId,classGrade.getGradeId(),userId);
         return true;

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -45,7 +45,7 @@
         FROM
             exam_knowledge ek
         WHERE
-            FIND_IN_SET( ek.knowledge_id, #{knowledge_ids} )
+            FIND_IN_SET( ek.knowledge_id, #{knowledge_ids} ) AND ek.status !=-1
     </select>
     <select id="findBusinessList" resultMap="QuestionBusiness">
         SELECT