Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Sale.php

@@ -1650,7 +1650,7 @@ class Sale extends Base
             'good_weight' => $goodinfo['good_weight'],
             'gold_price' => $goodinfo['gold_price'],
             'cost_price' => $goodinfo['sale_cost_fee'],
-            'pay_id' => $good['pay_id'],
+            'pay_id' => $data['pay_id'],
             'diff_weight' => 0,
             'diff_fee' => 0,
             "addtime" => date("Y-m-d H:i:s"),
@@ -1943,7 +1943,7 @@ class Sale extends Base
             'good_weight' => $good['noble_weight'],
             'gold_price' => isset($good['cgd_gold_price']) ? $good['cgd_gold_price'] : 0,
             'cost_price' => $goodlass['cost_fee'],
-            'pay_id' => $good['pay_id'],
+            'pay_id' => $data['pay_id'],
             'diff_weight' => 0,
             'diff_fee' => 0,
             "addtime" => date("Y-m-d H:i:s"),