rabin 9 달 전
부모
커밋
88b02ed2e3
2개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 0
      src/dai/seller/lib/Order.php
  2. 1 1
      src/dai/seller/table/manage/goods.php

+ 3 - 0
src/dai/seller/lib/Order.php

@@ -254,6 +254,9 @@ class Order
         
         # 查询折扣 扣费
         $seller_goods = Dever::db('goods', 'seller')->find(array('seller_id' => $seller_id, 'goods_id' => $goods_id, 'sku_id' => $sku_id));
+        if (!$seller_goods) {
+            $seller_goods = Dever::db('goods', 'seller')->find(array('seller_id' => $seller_id, 'goods_id' => $goods_id, 'sku_id' => -1));
+        }
 
         $info = Dever::db('info', 'seller')->find($seller_id);
         if ($seller_goods && $seller_goods['discount'] > 0) {

+ 1 - 1
src/dai/seller/table/manage/goods.php

@@ -12,7 +12,7 @@ return array
                 # 仅显示最后一级
                 //'all' => false,
                 'option'    => 'Dever::call("goods/manage.getGoods")',
-                'remote' => 'goods/manage.getSku',
+                'remote' => 'goods/manage.getAllSku',
                 # 无需默认值
                 'remote_default' => false,
                 'rules' => true,