edit

app/shop/database/goods_sku.php

@@ -73,7 +73,7 @@ $config = array
             'list_order' => 3,
         ),
 
-        'goods-info-code'=> array
+        'goods-info_sku-code'=> array
         (
             'name'      => '商品编码',
             'default'   => '',
@@ -85,7 +85,7 @@ $config = array
             'list_order' => 4,
         ),
 
-        'goods-info-price'=> array
+        'goods-info_sku-price'=> array
         (
             'name'      => '零售单价',
             'default'   => '',

app/shop/lib/Sell.php

@@ -750,7 +750,12 @@ class Sell
         }
 
         if ($method == 2) {
-            $order_data['ps_cash'] = $shop['ps_cash'];
+            $ps_cash = $shop['ps_cash'];
+            if ($shop['free_ps_cash'] && $shop['free_ps_cash'] > 0 && $price >= $shop['free_ps_cash']) {
+                $ps_cash = 0;
+            }
+
+            $order_data['ps_cash'] = $ps_cash;
             $price += $order_data['ps_cash'];
         }
         

app/store/database/goods_sku.php

@@ -60,7 +60,7 @@ $config = array
             'list_order' => 1,
         ),
 
-        'goods-info-code'=> array
+        'goods-info_sku-code'=> array
         (
             'name'      => '商品编码',
             'default'   => '',
@@ -79,7 +79,7 @@ $config = array
             'list_order' => 2,
         ),
 
-        'goods-info-f_price'=> array
+        'goods-info_sku-f_price'=> array
         (
             'name'      => '门店进货单价',
             'default'   => '',