submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderGoodsController.java

@@ -205,4 +205,10 @@ public class OrderGoodsController extends BaseController {
     public AjaxResult<List<OrderUserGoodsVo>> listUserSubjectGoods(OrderSubjectUserBuyBo bo) {
         return AjaxResult.success(iOrderGoodsService.listUserSubjectGoods(bo));
     }
+
+    @ApiOperation("业务层次，科目查询用户的购买商品列表")
+    @PostMapping("/listUserSubjectGoods/new")
+    public AjaxResult<List<OrderUserGoodsVo>> listUserSubjectGoodsNew(@RequestBody OrderSubjectUserBuyBo bo) {
+        return AjaxResult.success(iOrderGoodsService.listUserSubjectGoodsNew(bo));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderSubjectUserBuyBo.java

@@ -17,6 +17,7 @@ import java.util.List;
 @ApiModel("订单用户购买状态对象")
 public class OrderSubjectUserBuyBo {
 
+    @NotNull(message = "身份证号不能为空")
     @ApiModelProperty("身份证号")
     private List<String> idCard;
 
@@ -28,7 +29,6 @@ public class OrderSubjectUserBuyBo {
     @ApiModelProperty("科目ID")
     private Long subjectId;
 
-    @NotNull(message = "手机号码不能为空")
     @ApiModelProperty("手机号码")
     private List<String> tel;
 }

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

@@ -141,4 +141,6 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
     List<OrderGoods> listByNotTenant();
 
     Boolean upBatchNumById(OrderGoods orderGoods);
+
+    List<OrderUserGoodsVo> listUserSubjectGoodsNew(OrderSubjectUserBuyBo bo);
 }

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

@@ -968,6 +968,32 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return baseMapper.upBatchNumById(orderGoods) > 0;
     }
 
+    @Override
+    public List<OrderUserGoodsVo> listUserSubjectGoodsNew(OrderSubjectUserBuyBo bo) {
+        List<OrderUserGoodsVo> allList = new ArrayList<>();
+        for(String idCard : bo.getIdCard()){
+            User user = iUserService.getOne(new LambdaQueryWrapper<User>()
+                    .eq(User::getIdCard, EncryptHandler.encrypt(idCard)).last("limit 1"));
+            if(Validator.isNull(user)){
+                OrderUserGoodsVo goodsBo = new OrderUserGoodsVo();
+                goodsBo.setIdCard(idCard);
+                goodsBo.setGoodsList(new ArrayList<>());
+                allList.add(goodsBo);
+            }else{
+                GoodsQueryBo queryBo = new GoodsQueryBo();
+                queryBo.setSubjectId(bo.getSubjectId());
+                queryBo.setBusinessId(bo.getBusinessId());
+                queryBo.setUserId(user.getUserId());
+                List<OrderGoodsVo> list = this.baseMapper.listUserSubjectGoods(queryBo);
+                OrderUserGoodsVo goodsBo = new OrderUserGoodsVo();
+                goodsBo.setIdCard(idCard);
+                goodsBo.setGoodsList(list);
+                allList.add(goodsBo);
+            }
+        }
+        return allList;
+    }
+
     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"));