Merge remote-tracking branch 'origin/master'

yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java

@@ -141,7 +141,8 @@ public class SubmitOrderListener {
                 order.setIsPayed(0);
                 order.setHbOrderStatus(OrderStatus.UNPAY.value());
                 order.setOrderType(OrderType.ORDINARY.value());
-                double actualTotal = shopCartOrderDto.getActualTotal();
+                //加运费
+                double actualTotal = Arith.add(shopCartOrderDto.getActualTotal(),shopCartOrderDto.getTransfee());
                 //企业用户才进这个判断,并且该用户的积分必须大于0
                 if (1 == mergerOrder.getPlatform() && null != point && point > 0) {
                     order.setOrderType(OrderType.SCORE.value());