Merge branches 'developer' and 'developerB' of git.caimei365.com:chao/caimei-modules-soa into developerB

pay/src/main/java/com/caimei/module/pay/service/impl/PayServiceImpl.java

@@ -285,6 +285,7 @@ public class PayServiceImpl implements PayService {
                     commonAmount = MathUtil.add(commonAmount, orderProduct.getShouldPayFee());
                 }
             }
+            order.setPayTotalFee(MathUtil.add(order.getPayTotalFee(), order.getPromotionFullReduction()));
         }
         if (MathUtil.compare(privateAccountAmount, order.getPayTotalFee()) == 0 || "1".equals(order.getSecondHandOrderFlag())) {
             //二手订单与不含税-不能开票,全部分给私账