Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/MallOrderController.java

@@ -159,7 +159,6 @@ public class MallOrderController {
             salesOrder.setSalesPayMoney(money_paid);
             salesOrder.setSalesPayType(1);
             salesOrder.setSalesWaitMoney(total_amount - money_paid);
-            salesOrder.setSalesWaitMoney(money_paid);
             salesOrder.setSalesShippingFee(shipping_fee);
             salesOrder.setSalesPayTime(pay_time);
             salesOrder.setSalesLastMoney(money_paid);