查询详情targetUserId判断

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionBookServiceImpl.java

@@ -100,13 +100,16 @@ public class CollectionBookServiceImpl implements CollectionBookService {
     public Result findList(CollectionBookRequestDto dto) {
         try {
             List<Map<String, Object>> list = new ArrayList<>();
-            Long userId = dto.getTargetUserId();
+            Long userId;
             String shareRecordId = dto.getShareRecordId();
             if (StringUtils.hasLength(shareRecordId)) {
                 CollectionShareRecord collectionShareRecord = collectionShareRecordDao.findById(shareRecordId);
-                long itemUserId = collectionShareRecord.getItemUserId();
-                if (itemUserId != userId) {
-                    userId = itemUserId;
+                userId = collectionShareRecord.getItemUserId();
+            } else {
+                if (dto.getTargetUserId() != null) {
+                    userId = dto.getTargetUserId();
+                } else {
+                    return Result.failed("targetUserId不能为空");
                 }
             }
             List<CollectionBook> collectionBookList = collectionBookDao.findByUserId(userId);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionItemsRelationServiceImpl.java

@@ -90,7 +90,7 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
         try {
             CollectionBookVo collectionBookVo = new CollectionBookVo();
             collectionBookVo.setIsMine(true);
-            Long searchUserId = dto.getUserId();
+            Long searchUserId = null;
             //判断主态还是客态
             if (StringUtils.hasLength(dto.getShareRecordId())) {
                 CollectionShareRecord collectionShareRecord = collectionShareRecordDao.findById(dto.getShareRecordId());
@@ -106,6 +106,12 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                     logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
 
                 }
+            } else {
+                if (dto.getTargetUserId() != null) {
+                    searchUserId = dto.getTargetUserId();
+                } else {
+                    return Result.failed("targetUserId不能为空");
+                }
             }
             //查询所有的上传藏品
             SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -807,6 +807,71 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
     }
 
 
+    @Override
+    public Result findOrderOfCollector(DistributionOrderRequestDto dto) {
+        try {
+            //检查是否有超时未支付订单
+            checkPrePayTimeOut(null, dto.getSellerId());
+            List<DistributionOrderVo> distributionOrderVoList = new ArrayList<>();
+            if (StringUtils.hasLength(dto.getSearchParam())) {
+                //判断查询条件是否为中文，是的话就根据商品名称模糊查询
+                if (RegexUtil.isContainChinese(dto.getSearchParam())) {
+                    SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
+                    supplierItemRequestDto.setName(dto.getSearchParam());
+                    List<SupplierItem> supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
+                    List<Long> itemIds = supplierItemList.stream().map(SupplierItem::getId).collect(Collectors.toList());
+                    if (!CollectionUtils.isEmpty(itemIds)) {
+                        dto.setItemIdList(itemIds);
+                    } else {
+                        //没有对应名称的商品则直接返回空数据
+                        return Result.success();
+                    }
+                } else {
+                    dto.setDistributionOrderId(dto.getSearchParam());
+                }
+            }
+            //查询分销订单
+            List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
+            PageInfo pageInfo = new PageInfo<>(distributionOrderList);
+            distributionOrderList.forEach(distributionOrder -> {
+                DistributionOrderVo distributionOrderVo = new DistributionOrderVo();
+                EntityMapper.copyAttribute(distributionOrder, distributionOrderVo);
+                SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
+                distributionOrderVo.setItemName(supplierItem.getName());
+                long itemPrice = distributionOrder.getAmount() / distributionOrder.getItemNum();
+                distributionOrderVo.setAmount(PriceUtil.convertPriceFenToYuan(distributionOrder.getAmount()));
+                distributionOrderVo.setItemPrice(PriceUtil.convertPriceFenToYuan(itemPrice));
+                distributionOrderVo.setBuyerName(cacheUtil.getAppletUserNameById(distributionOrder.getBuyerId()));
+                distributionOrderVo.setBuyerAvatar(cacheUtil.getAppletUserList(distributionOrder.getBuyerId()) == null?"":cacheUtil.getAppletUsers(distributionOrder.getBuyerId()).getAvatar());
+                distributionOrderVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
+                distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
+                distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
+                //支付截止时间，下单后半小时内
+                Date date = distributionOrder.getCreateTime();
+                Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
+                Date time = Date.from(instant);
+                distributionOrderVo.setPayEndTime(time);
+                //查询订单利润
+                DistributorProfit distributorProfit = distributorProfitDao.findByIdOfDistributor(distributionOrder.getDistributionOrderId(), distributionOrder.getSellerId());
+                if (distributorProfit != null) {
+                    distributionOrderVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
+                } else {
+                    distributionOrderVo.setProfit("0");
+                }
+                distributionOrderVoList.add(distributionOrderVo);
+            });
+            return Result.success(PageSearchResult.of(pageInfo, distributionOrderVoList));
+        } catch (Exception e) {
+            logger.error("查询藏馆订单列表失败 error : {}", e);
+        }
+        return Result.failed();
+    }
+
+    @Override
+    public Result findOrderDetailOfCollector(DistributionOrderRequestDto dto) {
+        return null;
+    }
+
     public void checkPrePayTimeOut(String distributionOrderId, int type){
         DistributionOrder distributionOrder = distributionOrderDao.findById(distributionOrderId);
         if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode()) {
@@ -842,7 +907,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         prePayList.forEach(distributionOrder -> {
             long diffInMillies = Math.abs(new Date().getTime() -  distributionOrder.getCreateTime().getTime());
             int type = distributionOrder.getType();
-            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
+            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || type == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
                 long diffInMinutes = diffInMillies / (60 * 1000);
                 if (diffInMinutes >= 30) {
                     //待支付超出半小时，订单取消

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/DistributionOrderService.java

@@ -85,6 +85,20 @@ public interface DistributionOrderService {
      */
     Result findOrderDetailOfUser(DistributionOrderRequestDto dto);
 
+
+    /**
+     * 藏馆订单列表查询
+     */
+    Result findOrderOfCollector(DistributionOrderRequestDto dto);
+
+    /**
+     * 查询藏馆订单详情
+     * @param dto
+     * @return
+     */
+    Result findOrderDetailOfCollector(DistributionOrderRequestDto dto);
+
+
     /**
      * 订单退款
      * @param dto