推荐列表详情

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/FollowFansRecordRequestDto.java

@@ -15,6 +15,11 @@ public class FollowFansRecordRequestDto extends BaseRequestDto implements Entity
      */
     private Long searchTargetId;
 
+    /**
+     * 当前登录的用户
+     */
+    private Long userId;
+
     /**
      * 粉丝id
      */

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

@@ -351,6 +351,7 @@ public class FollowFansRecordServiceImpl implements FollowFansRecordService {
         try {
             List<FollowFansRecordVo> followFansRecordVos = new ArrayList<>();
             dto.setFollowerId(dto.getSearchTargetId());
+            dto.setIntroducerId(dto.getUserId());
             List<FollowFansRecord> followFansRecordList = followFansRecordDao.findList(dto);
             PageInfo<FollowFansRecord> pageInfo = new PageInfo<>(followFansRecordList);
             followFansRecordList.forEach(f -> {

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

@@ -833,7 +833,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             //查询分销订单
             List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
             PageInfo pageInfo = new PageInfo<>(distributionOrderList);
-            distributionOrderList.forEach(distributionOrder -> {
+            for (DistributionOrder distributionOrder : distributionOrderList) {
                 DistributionOrderVo distributionOrderVo = new DistributionOrderVo();
                 EntityMapper.copyAttribute(distributionOrder, distributionOrderVo);
                 SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
@@ -841,8 +841,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 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.setBuyerName(cacheUtil.appletUserInfoCache.get(distributionOrder.getBuyerId()).get().getNickname());
+                String avatar = cacheUtil.appletUserInfoCache.get(distributionOrder.getBuyerId()).get().getAvatar();
+                distributionOrderVo.setBuyerAvatar(avatar == null ? CommConsts.DEFAULT_AVATAR_URL : avatar);
                 distributionOrderVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
                 distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
@@ -851,15 +852,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 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);
@@ -869,7 +863,58 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
     @Override
     public Result findOrderDetailOfCollector(DistributionOrderRequestDto dto) {
-        return null;
+        try {
+            DistributionOrder distributionOrder = distributionOrderDao.findById(dto.getDistributionOrderId());
+            int type = distributionOrder.getType();
+
+            //检查订单是否超时未付款
+            checkPrePayTimeOut(dto.getDistributionOrderId(), type);
+
+            DistributionOrderDetailVo distributionOrderDetailVo = new DistributionOrderDetailVo();
+            EntityMapper.copyAttribute(distributionOrder, distributionOrderDetailVo);
+            SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
+            distributionOrderDetailVo.setItemName(supplierItem.getName());
+            long itemPrice = distributionOrder.getAmount() / distributionOrder.getItemNum();
+            distributionOrderDetailVo.setAmount(PriceUtil.convertPriceFenToYuan(distributionOrder.getAmount()));
+            distributionOrderDetailVo.setItemPrice(PriceUtil.convertPriceFenToYuan(itemPrice));
+            distributionOrderDetailVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
+            distributionOrderDetailVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
+            distributionOrderDetailVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
+            distributionOrderDetailVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
+            DistributorProfit distributorProfit = distributorProfitDao.findByIdOfDistributor(dto.getDistributionOrderId(), distributionOrder.getSellerId());
+            //供货价
+            Long distributionTotalPrice = distributorProfit.getItemCost();
+            distributionOrderDetailVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(distributionTotalPrice));
+            distributionOrderDetailVo.setChannelCost("6‰");
+
+            //平台服务费
+            double channelServiceCost = distributionOrder.getAmount().doubleValue()  * 0.05;
+
+            //介绍人分佣
+
+
+
+            //利润
+            Double profit = distributorProfit.getProfit().doubleValue();
+
+
+            //一口价支付截止时间为下单半小时后，竞拍为24小时
+            Date date = distributionOrder.getCreateTime();
+            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
+                Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
+                Date time = Date.from(instant);
+                distributionOrderDetailVo.setPayEndTime(time);
+            } else {
+                Instant instant = date.toInstant().plus(Duration.ofHours(24));
+                Date time = Date.from(instant);
+                distributionOrderDetailVo.setPayEndTime(time);
+            }
+            distributionOrderDetailVo.setProfit(PriceUtil.convertDoubleToString(profit));
+            return Result.success(distributionOrderDetailVo);
+        } catch (Exception e) {
+            logger.error("查询藏馆订单详情失败 error : {}", e);
+        }
+        return Result.failed();
     }
 
     public void checkPrePayTimeOut(String distributionOrderId, int type){