Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7

@@ -32,6 +32,10 @@ public class AmountDetailBo {
      * 运费券减免金额
      * 运费券减免金额
      */
      */
     private double shippingCouponCutAmount;
     private double shippingCouponCutAmount;
+    /**
+     * 活动减免的运费金额
+     */
+    private double shippingActivityCutAmount;
 
 
     /**
     /**
      * 关税费率
      * 关税费率

@@ -162,7 +162,7 @@ public class OrderDetailInfo {
         String goodPrice;
         String goodPrice;
 
 
         /**
         /**
-         * 运费
+         * 没有任何优惠的原始运费
          */
          */
         String feePrice;
         String feePrice;
 
 
@@ -180,8 +180,17 @@ public class OrderDetailInfo {
          * 运费券金额
          * 运费券金额
          */
          */
         String shippingCouponCutPrice;
         String shippingCouponCutPrice;
+
+        /**
+         * 活动减免
+         */
+        String shippingActivityCutPrice;
+        /**
+         * 活动减免的税费
+         */
+        String tariffActivityCutPrice;
         /**
         /**
-         * 税费
+         * 原始税费
          */
          */
         String tariffPrice;
         String tariffPrice;
 
 

@@ -249,8 +249,15 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen
                     .build();
                     .build();
             SkupTypeCodeSupport.CodeNode codeNode = SkupTypeCodeSupport.explain(buyerOrder.getAttributes());
             SkupTypeCodeSupport.CodeNode codeNode = SkupTypeCodeSupport.explain(buyerOrder.getAttributes());
             if (codeNode.getRegion() == RegionEnum.HONGKONG.getCode()){
             if (codeNode.getRegion() == RegionEnum.HONGKONG.getCode()){
-                double finalTariffPrice = YHMath.sub(amountDetailBo.getTariffAmount(), amountDetailBo.getTariffCutAmount());
-                priceInfo.setTariffPrice(MathUtils.formatStr(finalTariffPrice));
+                //tariff
+                double cutTarrifPrice = amountDetailBo.getTariffCutAmount();
+                double normalTarrifPrice = amountDetailBo.getTariffAmount();
+                priceInfo.setTariffPrice(MathUtils.formatStr(normalTarrifPrice));
+                priceInfo.setTariffActivityCutPrice(MathUtils.formatStr(cutTarrifPrice));
+
+                //ship fee
+                double cutShipPrice = amountDetailBo.getShippingActivityCutAmount();
+                priceInfo.setShippingActivityCutPrice(MathUtils.formatStr(cutShipPrice));
             }
             }
         } else {
         } else {
             //priceInfo
             //priceInfo

@@ -137,21 +137,16 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
         return detailDesc;
         return detailDesc;
     }
     }
 
 
+    @Override
     protected OrderDetailInfo.StatusDetail getStatusDetail(BuyerOrder buyerOrder,OrderStatus orderStatus, TabType tabType) {
     protected OrderDetailInfo.StatusDetail getStatusDetail(BuyerOrder buyerOrder,OrderStatus orderStatus, TabType tabType) {
         OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail.builder()
         OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail.builder()
                 .status(orderStatus.getCode())
                 .status(orderStatus.getCode())
                 .statuStr(orderStatus.getStatusStr(tabType))
                 .statuStr(orderStatus.getStatusStr(tabType))
-
                 .build();
                 .build();
         String detailDesc = formatDetailDesc(buyerOrder, orderStatus.getDetailDesc(tabType));
         String detailDesc = formatDetailDesc(buyerOrder, orderStatus.getDetailDesc(tabType));
         statusDetail.setDetailDesc(detailDesc);
         statusDetail.setDetailDesc(detailDesc);
         OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes());
         OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes());
         // 待付款时，剩余时间
         // 待付款时，剩余时间
-        /*
-        Integer leftTime = getLeftTime(tabType,buyerOrder.getUid(),
-                buyerOrder.getOrderCode(), orderStatus.getCode(),
-                buyerOrder.getCreateTime(), oa);
-        */
         TimeoutBo timeoutBo = calTimeout(tabType,buyerOrder.getUid(),
         TimeoutBo timeoutBo = calTimeout(tabType,buyerOrder.getUid(),
                 buyerOrder.getOrderCode(), orderStatus.getCode(),
                 buyerOrder.getOrderCode(), orderStatus.getCode(),
                 buyerOrder.getCreateTime(), oa);
                 buyerOrder.getCreateTime(), oa);

@@ -635,6 +635,11 @@ public class ShoppingServiceImpl implements IShoppingService {
             amountDetailBo.setTariffAmount(tariffFee.getAmount());
             amountDetailBo.setTariffAmount(tariffFee.getAmount());
             amountDetailBo.setTariffCutAmount(tariffFee.getCutAmount());
             amountDetailBo.setTariffCutAmount(tariffFee.getCutAmount());
         }
         }
+        SingleFeeDetail shipFeeDetail;
+        if (Objects.nonNull(shipFeeDetail = chargeResult.getShipFeeDetail())){
+            amountDetailBo.setShippingActivityCutAmount(shipFeeDetail.getCutAmount());
+        }
+
         //活动券减免金额
         //活动券减免金额
         chargeResult.getCouponPayResultList().getCouponPayResultByCouponType(CouponTypeEnum.ACTIVITY_COUPON.getCode()).
         chargeResult.getCouponPayResultList().getCouponPayResultByCouponType(CouponTypeEnum.ACTIVITY_COUPON.getCode()).
                 ifPresent(tempPayResult -> amountDetailBo.setCouponCutAmount(tempPayResult.getCouponAmount()));
                 ifPresent(tempPayResult -> amountDetailBo.setCouponCutAmount(tempPayResult.getCouponAmount()));