submit

zhongzheng-api/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -80,8 +80,7 @@ public class ClassGradeController extends BaseController {
     @ApiOperation("获取班级详细信息")
     @GetMapping("/{classId}")
     public AjaxResult<ClassGradeVo> getInfo(@PathVariable("classId") Long classId) {
-        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success(iClassGradeService.queryClassById(classId,loginUser.getUser().getUserId()));
+        return AjaxResult.success(iClassGradeService.queryById(classId));
     }
 
     /**

zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -218,4 +218,13 @@ public class OrderController extends BaseController {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         return toAjax(iOrderService.studyCheck(orderGoodsId,loginUser.getUser().getUserId()) ? 1 : 0);
     }
+
+    /**
+     * 获取订单商品
+     */
+    @ApiOperation("获取订单商品")
+    @GetMapping("/seven/year/{orderGoodsId}")
+    public AjaxResult<String> getOrderSevenYear(@PathVariable("orderGoodsId")Long orderGoodsId) {
+        return AjaxResult.success("成功",iOrderGoodsService.getOrderSevenYear(orderGoodsId));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -88,5 +88,4 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
     @InterceptorIgnore(tenantLine = "true")
     void UpGradeInterfaceByTenant(ClassGradeOpenUpBo upBo);
 
-    OrderGoods getOrderGoodsByClassId(@Param("gradeId") Long gradeId,@Param("userId") Long userId);
 }

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

@@ -23,8 +23,6 @@ public interface IClassGradeService extends IService<ClassGrade> {
 	 */
 	ClassGradeVo queryById(Long classId);
 
-	ClassGradeVo queryClassById(Long classId, Long userId);
-
 	/**
 	 * 查询列表
 	 */

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

@@ -184,18 +184,6 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         return entity2Vo(baseMapper.queryList(classGradeQueryBo)).get(0);
     }
 
-    @Override
-    public ClassGradeVo queryClassById(Long gradeId,Long userId) {
-        ClassGradeQueryBo classGradeQueryBo = new ClassGradeQueryBo();
-        classGradeQueryBo.setGradeId(gradeId);
-        ClassGradeVo vo = entity2Vo(baseMapper.queryList(classGradeQueryBo)).get(0);
-        //七大员继教年份
-        OrderGoods orderGoods = baseMapper.getOrderGoodsByClassId(gradeId,userId);
-        if (ObjectUtils.isNotNull(orderGoods)){
-            vo.setSevenYear(orderGoods.getSevenYear());
-        }
-        return vo;
-    }
 
     @Override
     @DataScope(businessAlias = "cb")

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

@@ -122,4 +122,6 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
     OrderGoods getSevenLastOne(Integer projectId,String sevenYear,Long userId);
 
     Long countOrderGoodsByYear(String sevenYear, Long goodsId, Long userId);
+
+    String getOrderSevenYear(Long orderGoodsId);
 }

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

@@ -734,6 +734,15 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return baseMapper.countOrderGoodsByYear(sevenYear, goodsId, userId);
     }
 
+    @Override
+    public String getOrderSevenYear(Long orderGoodsId) {
+        OrderGoods orderGoods = getById(orderGoodsId);
+        if (ObjectUtils.isNull(orderGoods)){
+            return "";
+        }
+        return orderGoods.getSevenYear();
+    }
+
     private boolean checkUnique(Long GoodsId,Long UserId) {
         ShoppingCart info = iShoppingCartService.getOne(new LambdaQueryWrapper<ShoppingCart>()
                 .eq(ShoppingCart::getUserId,UserId).eq(ShoppingCart::getGoodsId,GoodsId).last("limit 1"));

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

@@ -1085,18 +1085,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update class_grade set interface_push_id = #{interfacePushId} where grade_id = #{gradeId}
     </update>
 
-    <select id="getOrderGoodsByClassId" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.order.domain.OrderGoods" >
-        SELECT
-            og.*
-        FROM
-            order_goods og
-                LEFT JOIN `order` o ON og.order_sn = o.order_sn
-        WHERE
-            og.pay_status IN ( 2, 3, 4 )
-            AND og.refund_status != 2
-	        AND og.`status` = 1
-	        AND o.`status` = 1
-	        AND o.user_id = #{userId}
-	        AND og.grade_id = #{gradeId}
-    </select>
 </mapper>