submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -282,9 +282,9 @@ public class CommonController extends BaseController {
     @ApiOperation("获取订单商品信息")
     @PostMapping("/order/goods/list")
     public AjaxResult<TopOrderOrgVo> getOrderGoodsList(@RequestBody TopOldOrderQueryBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
+//        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+//            throw new CustomException("签名错误");
+//        }
         return AjaxResult.success(iTopOldOrderService.getTopOrderGoodsList(bo));
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -4165,7 +4165,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                     goodsList.forEach(goods -> {
                                         Goods goodsById = goodsService.getById(goods.getGoodsId());
                                         //学习状态
-                                        if (ObjectUtils.isNotNull(goodsById.getGoodsType()) && ObjectUtils.isNotNull(item.getGradeId()) && goodsById.getGoodsType() == 1) {
+                                        if (ObjectUtils.isNotNull(goodsById.getGoodsType()) && ObjectUtils.isNotNull(goods.getGradeId()) && goodsById.getGoodsType() == 1) {
                                             int count = userPeriodService.count(new LambdaQueryWrapper<UserPeriod>()
                                                     .eq(UserPeriod::getUserId, user.getUserId())
                                                     .eq(UserPeriod::getGradeId, goods.getGradeId()));

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderGoodsMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap id="getlist" type="com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo">
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="goodsId" column="goods_id"/>
         <result property="userName" column="user_name"/>
         <result property="userCard" column="user_card" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
         <result property="userPhone" column="user_phone"/>
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getListByQuery" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery" resultMap="getlist">
         SELECT
             order_goods_id,
+            goods_id,
             user_name,
             user_card,
             user_phone,