yangdamao 1 year ago
parent
commit
254be3dd7f

+ 4 - 4
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -2103,10 +2103,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             }
             }
             item.setUserId(user.getUserId());
             item.setUserId(user.getUserId());
             //查询购买课程
             //查询购买课程
-            UserBusinessGoodsVo goodsVo = baseMapper.getCourseByUser(item);
-            if (ObjectUtils.isNotNull(goodsVo)){
-                goodsVo.setIdNum(item.getIdNum());
-                goodsBoList.add(goodsVo);
+            List<UserBusinessGoodsVo> goodsVo = baseMapper.getCourseByUser(item);
+            if (!CollectionUtils.isEmpty(goodsVo)){
+                goodsVo.forEach(x -> x.setIdNum(item.getIdNum()));
+                goodsBoList.addAll(goodsVo);
             }
             }
         }
         }
         return goodsBoList;
         return goodsBoList;

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -95,5 +95,5 @@ public interface UserMapper extends BaseMapper<User> {
     @InterceptorIgnore(tenantLine = "true")
     @InterceptorIgnore(tenantLine = "true")
     Long getFistStudyTime(@Param("userId")Long userId,@Param("tenantId")Long tenantId,@Param("businessName")String businessName);
     Long getFistStudyTime(@Param("userId")Long userId,@Param("tenantId")Long tenantId,@Param("businessName")String businessName);
 
 
-    UserBusinessGoodsVo getCourseByUser(UserBusinessGoodsBo item);
+    List<UserBusinessGoodsVo> getCourseByUser(UserBusinessGoodsBo item);
 }
 }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserBusinessGoodsVo.java

@@ -21,5 +21,5 @@ public class UserBusinessGoodsVo implements Serializable {
 
 
     private String categoryName;
     private String categoryName;
 
 
-    private Long createTime;
+    private Long createTimeStamp;
 }
 }

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -695,7 +695,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             CONCAT( cet.education_name, cb.business_name, cpt.project_name ) AS business_name,
             CONCAT( cet.education_name, cb.business_name, cpt.project_name ) AS business_name,
             m.category_name AS majorName,
             m.category_name AS majorName,
             g.goods_name AS categoryName,
             g.goods_name AS categoryName,
-            og.create_time AS createTime
+            og.create_time AS createTimeStamp
         FROM
         FROM
             `order` o
             `order` o
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn