订单列表展示利润

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/DistributorProfitDao.java

@@ -36,6 +36,14 @@ public interface DistributorProfitDao {
      */
     DistributorProfit findById(String distributionOrderId);
 
+
+    /**
+     * 根据分销单号查询
+     * @param distributionOrderId
+     * @return
+     */
+    DistributorProfit findByIdOfDistributor(String distributionOrderId, long distributorId);
+
     /**
      * 统计分销商卖出的商品数量
      *

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/DistributorProfitDaoImpl.java

@@ -44,6 +44,15 @@ public class DistributorProfitDaoImpl implements DistributorProfitDao {
         return distributorProfitMapper.selectOneByExample(example);
     }
 
+    @Override
+    public DistributorProfit findByIdOfDistributor(String distributionOrderId, long distributorId) {
+        DistributorProfitExample example = new DistributorProfitExample();
+        DistributorProfitExample.Criteria criteria = example.createCriteria();
+        criteria.andDistributionOrderIdEqualTo(distributionOrderId);
+        criteria.andDistributorIdEqualTo(distributorId);
+        return distributorProfitMapper.selectOneByExample(example);
+    }
+
     @Override
     public Long countSellItemNum(long distributorId) {
         Long num =  distributorProfitMapper.countSellItemNum(distributorId);

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/DistributionOrderVo.java

@@ -160,4 +160,10 @@ public class DistributionOrderVo implements Entity {
     private Integer type;
 
     private String typeName;
+
+    /**
+     * 利润
+     */
+    private String profit;
 }
+

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

@@ -625,6 +625,9 @@ 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());
+                distributionOrderVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
                 distributionOrderVoList.add(distributionOrderVo);
             });
             return Result.success(PageSearchResult.of(pageInfo, distributionOrderVoList));
@@ -654,7 +657,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributionOrderDetailVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
             distributionOrderDetailVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
             distributionOrderDetailVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
-            DistributorProfit distributorProfit = distributorProfitDao.findById(dto.getDistributionOrderId());
+            DistributorProfit distributorProfit = distributorProfitDao.findByIdOfDistributor(dto.getDistributionOrderId(), distributionOrder.getSellerId());
             //供货价
             Long distributionTotalPrice = distributorProfit.getItemCost();
             distributionOrderDetailVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(distributionTotalPrice));