签到付款2

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

@@ -287,5 +287,8 @@ public class DistributionOrderDetailVo implements Entity {
      */
     private UserExchangeInfo userExchangeInfo;
 
-
+    /**
+     * 运费
+     */
+    private String logisticsAmount;
 }

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

@@ -1153,7 +1153,12 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributionOrderDetailVo.setItemName(supplierItem.getName());
             long itemPrice = distributionOrder.getAmount() / distributionOrder.getItemNum();
             distributionOrderDetailVo.setAmount(PriceUtil.convertPriceFenToYuan(distributionOrder.getAmount()));
+            if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GIFT.getCode()) {
+                distributionOrderDetailVo.setItemPrice("0");
+                distributionOrderDetailVo.setLogisticsAmount("10");
+            } else {
                 distributionOrderDetailVo.setItemPrice(PriceUtil.convertPriceFenToYuan(itemPrice));
+            }
             distributionOrderDetailVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
             distributionOrderDetailVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
             distributionOrderDetailVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));