Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/admin/model/order/StoreOrder.php

@@ -317,7 +317,7 @@ HTML;
                 $item['pay_price'],
                 $item['pay_postage'],
                 $item['pay_postage_sh'],
-                $item['pay_price'] + $item['coupon_price'],
+                $item['total_price'] + $item['pay_postage'] + $item['pay_postage_sh'],
                 $item['deposit'],
                 $item['deposit_back'],
                 $item['use_integral'],