Merge branch 'dev_6.8.7_order_出售权限' into test6.8.8

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/seller/AbsSellerOrderComputeHandler.java

@@ -103,14 +103,14 @@ public abstract class AbsSellerOrderComputeHandler implements OrderComputeHandle
      * 服务费参与计算后需要考虑精度问题（四舍五入）
      * @return
      */
-    protected PlatformFeeDto calPlatformFee(BigDecimal price, ServiceFeeRate serviceFeeRate){
+    protected PlatformFeeDto calPlatformFee(BigDecimal price, ServiceFeeRate serviceFeeRate, PlatformFeeDto ppf){
         BigDecimal goodsServiceRate = serviceFeeRate.getGoodsPaymentRate();
 
 
         PlatformFeeDto platformFee = new PlatformFeeDto();
 
-        BigDecimal appraiseFee = new BigDecimal(getAppraiseFee());
-        BigDecimal packageFee = new BigDecimal(getPackageFee());
+        BigDecimal appraiseFee = ppf!=null && ppf.getAppraiseFee() != null ? ppf.getAppraiseFee() : new BigDecimal(getAppraiseFee());
+        BigDecimal packageFee = ppf!=null && ppf.getPackageFee() != null ? ppf.getPackageFee() : new BigDecimal(getPackageFee());
         BigDecimal serviceFee = price.multiply(goodsServiceRate);
 
         platformFee.setAppraiseFee(halfUp(appraiseFee));
@@ -130,7 +130,12 @@ public abstract class AbsSellerOrderComputeHandler implements OrderComputeHandle
         return packageFee;
     }
 
-    protected abstract ServiceFeeRate buildServiceFeeRate();
+    /**
+     * add input
+     * @param psfr
+     * @return
+     */
+    protected abstract ServiceFeeRate buildServiceFeeRate(ServiceFeeRate psfr);
 
     protected abstract Collection<BuyerPenalty.Fee> buildStagedCollection();
 }