Merge branch 'master' into dev1

Administrator

2018-11-21 c558c4f1130debfd785c74ff0e963afc6455f196

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -394,8 +394,13 @@
         } else// 计算订单的总金额

         {

            BigDecimal money = new BigDecimal(0);

            for (TaoBaoOrder o : orderList)

               money = money.add(o.getPayment());

            for (TaoBaoOrder o : orderList) {

               if (o.getOrderState().equalsIgnoreCase("订单结算"))

                  money = money.add(o.getSettlement());

               else {

                  money = money.add(o.getPayment());

               }

            }

            updateOrder.setMoney(money);

            String thirdState = null;

            for (TaoBaoOrder o : orderList)