订单详情

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

@@ -167,6 +167,11 @@ public class SupplierItemRequestDto extends BaseRequestDto implements Entity {
      */
     private List<Long> creatorIdList;
 
+    /**
+     * 排序字段
+     */
+    private String sortColumn;
+
 
 
 }

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

@@ -988,25 +988,13 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             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 introduceCost = distributionOrder.getAmount().doubleValue()  * 0.03;
-
-
-            //利润
-            Double profit = distributorProfit.getProfit().doubleValue();
-
+            distributionOrderDetailVo.setChannelCost(PriceUtil.convertPriceFenToYuan(distributorProfit.getChannelCost()));
+            distributionOrderDetailVo.setIntroduceCost(PriceUtil.convertPriceFenToYuan(distributorProfit.getIntroduceCost()));
+            distributionOrderDetailVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
 
             //一口价支付截止时间为下单半小时后，竞拍为24小时
             Date date = distributionOrder.getCreateTime();
-            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
+            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || type == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
                 Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
                 Date time = Date.from(instant);
                 distributionOrderDetailVo.setPayEndTime(time);
@@ -1015,7 +1003,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 Date time = Date.from(instant);
                 distributionOrderDetailVo.setPayEndTime(time);
             }
-            distributionOrderDetailVo.setProfit(PriceUtil.convertDoubleToString(profit));
             return Result.success(distributionOrderDetailVo);
         } catch (Exception e) {
             logger.error("查询藏馆订单详情失败 error : {}", e);