submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -13,6 +13,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.*;
 import com.zhongzheng.modules.course.service.ICourseService;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.course.vo.GoodsBatchListVo;
 import com.zhongzheng.modules.goods.bo.GoodsBatchDelBo;
 import com.zhongzheng.modules.goods.vo.ExportLiveGoodsVo;
 import com.zhongzheng.modules.goods.vo.GoodsUserVo;
@@ -216,20 +217,28 @@ public class CourseController extends BaseController {
 
     @ApiOperation("批量查询用户拥有的商品进度")
     @GetMapping("/goodsBatchList")
-    public AjaxResult<Map<String,Object>> goodsBatchList(CourseQueryBo bo) {
-        Map<String,Object> map = new HashMap<>();
+    public AjaxResult<List<GoodsBatchListVo>> goodsBatchList(CourseQueryBo bo) {
+        List<GoodsBatchListVo> listVos = new ArrayList<>();
+        if (CollectionUtils.isEmpty(bo.getTelphoneList())){
+            return null;
+        }
         for(CourseProgressQueryBo queryBo : bo.getTelphoneList()){
             User user = iUserService.getOne(new LambdaQueryWrapper<User>()
                     .eq(User::getTelphone, queryBo.getTelphone()).last("limit 1"));
             if(Validator.isEmpty(user)){
-                throw new CustomException("该用户不存在");
+                continue;
             }
-            bo.setUserId(user.getUserId());
-            bo.setGoodsId(queryBo.getGoodsId());
+            GoodsBatchListVo vo = new GoodsBatchListVo();
+            vo.setUserId(user.getUserId());
+            vo.setGoodsId(queryBo.getGoodsId());
+            vo.setTelphone(queryBo.getTelphone());
             List<GoodsUserVo> list = iCourseService.goodsProgressList(bo);
-            map.put(bo.getTelphone()+"-"+bo.getGoodsId(),list);
+            vo.setList(list);
+        }
+        if (CollectionUtils.isEmpty(listVos)){
+            return null;
         }
-        return AjaxResult.success(map);
+        return AjaxResult.success(listVos);
     }
 
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -319,4 +319,18 @@ public class GoodsController extends BaseController {
         return AjaxResult.success(iOrderGoodsService.getGoodsSectionList(bo));
     }
 
+
+    /**
+     * 获取用户所有购买商品
+     */
+    @ApiOperation("获取用户所有购买商品")
+    @PostMapping("/user/all")
+    public AjaxResult<List<GoodsSectionListVo>> getUserGoodsListAll(@RequestBody UserGoodsListAllBo bo) {
+//        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+//        bo.setUserId(loginUser.getUser().getUserId());
+//        return AjaxResult.success(iGoodsService.getUserGoodsListAll(bo));
+        return null;
+    }
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/GoodsBatchListVo.java

@@ -0,0 +1,23 @@
+package com.zhongzheng.modules.course.vo;
+
+import com.zhongzheng.modules.goods.vo.GoodsUserVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author yangdamao
+ * @date 2023年01月05日 11:47
+ */
+@Data
+public class GoodsBatchListVo implements Serializable {
+
+    private String telphone;
+
+    private Long goodsId;
+
+    private Long userId;
+
+    private List<GoodsUserVo> list;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/UserGoodsListAllBo.java

@@ -0,0 +1,26 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年01月05日 9:41
+ */
+@Data
+public class UserGoodsListAllBo implements Serializable {
+
+    @ApiModelProperty("教育类型ID")
+    private Long educationTypeId;
+
+    @ApiModelProperty("业务层次ID")
+    private Long businessId;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    @ApiModelProperty("用户ID")
+    private Long userId;
+}

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

@@ -1148,10 +1148,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public String getGoodsStudyUrl(GoodsStudyUrlBo bo) {
         String url = "";
         //中正学堂PC域名和H5域名 https://zzyxt.gdzzkj.net/  h.gdzzkj.net
-        String domain = "http://192.168.1.222:6002/";
-        String domainH5 = "https://h.xyyxt.net";
-//        String domain = "http://zzyxt.gdzzkj.net/";
-//        String domainH5 = "https://h.gdzzkj.net";
+//        String domain = "http://192.168.1.222:6002/";
+//        String domainH5 = "https://h.xyyxt.net";
+        String domain = "https://zzyxt.gdzzkj.net/";
+        String domainH5 = "https://h.gdzzkj.net";
         GoodsVo goods = baseMapper.queryGoodsByIdTenant(bo.getGoodsId(), bo.getTenantId());
         if (ObjectUtils.isNull(goods)) {
             throw new CustomException("商品不存在！");

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/UserGoodsListAllVo.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.goods.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年01月05日 10:02
+ */
+@Data
+public class UserGoodsListAllVo implements Serializable {
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/UserGoodsVo.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.goods.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年01月05日 10:20
+ */
+@Data
+public class UserGoodsVo implements Serializable {
+
+
+}