佣金计算机构运费

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -2050,6 +2050,12 @@ public class ReceiptServiceImpl implements ReceiptService {
             }
             BigDecimal otherFee = MathUtil.add(order.getDiscountFee(), MathUtil.add(shopOrder.getShopOtherFee(), shopOrder.getShopPostFee()));
             brokerage = MathUtil.sub(brokerage, otherFee);
+            // 佣金计算机构运费
+            if (order.getPostageFlag() == 1) {
+                if (order.getPostage() > 0) {
+                    brokerage = MathUtil.add(brokerage , order.getPostage());
+                }
+            }
             shopOrder.setBrokerage(brokerage.doubleValue());
         } else {
             double associateAmount = receiptMapper.countAllPayAssociateAmount(order.getOrderId());