1

app/admin/model/user/User.php

@@ -157,13 +157,13 @@ class User extends BaseModel
                     ->where('refund_status', 0)
                     ->where('is_del', 0)
                     ->where('is_system_del', 0)->select();
-                $num = 0;
+                $carts = [];
                 foreach ($orders as $v) {
-                    $num += StoreCart::where('id', 'in', $v['cart_id'])->where('is_suit', 1)->sum('cart_num');
+                    $carts = array_merge($carts, $v['cart_id']);
                 }
-
+                $num = StoreCart::where('id', 'in', $carts)->where('is_suit', 1)->field('sum(cart_num) as cart_num_sum')->find()['cart_num_sum'];
                 $item['suit_num'] = $num;
-
+//
                 $item['group_level_name'] = $item['group_level'] ? SystemGroupLevel::where('id', $item['group_level'])->value('name') : '--';
                 $item['award_level_name'] = $item['award_level'] ? SystemAwardLevel::where('id', $item['award_level'])->value('name') : '--';
 

app/admin/view/user/user/recharge_auth.php

@@ -107,7 +107,7 @@
 
                     <script type="text/html" id="type">
                         {{# if(d.type=='now_money'){ }}
-                        <font color="#eeff00"> 余额  </font>
+                        <font color="#559900"> 余额  </font>
                         {{# } }}
                         {{# if(d.type=='consumer'){ }}
                         <font color="#ff00ee"> 消费券  </font>

app/models/store/StoreProduct.php

@@ -620,11 +620,7 @@ class StoreProduct extends BaseModel
                     $twoBrokerage[$productInfo['store_id']] = bcadd($oneBrokerage[$productInfo['store_id']] ?? 0, bcmul($cartNum, $productInfo['attrInfo']['brokerage_two'] ?? 0, 2), 2);
                 } else {
                     //比例返佣
-                    if (isset($productInfo['attrInfo'])) {
-                        $sumProductPrice = bcadd($sumProductPrice, bcmul($cartNum, $productInfo['attrInfo']['price'] ?? 0, 2), 2);
-                    } else {
-                        $sumProductPriceBrokerage[$productInfo['store_id']] = bcadd($sumProductPriceBrokerage[$productInfo['store_id']] ?? 0, bcmul($cartNum, ($productInfo['attrInfo']['price'] ?? $product['price']) ?? 0, 2), 2);
-                    }
+                    $sumProductPriceBrokerage[$productInfo['store_id']] = bcadd($sumProductPriceBrokerage[$productInfo['store_id']] ?? 0, bcmul($cartNum, ($productInfo['attrInfo']['price'] ?? $product['price']) ?? 0, 2), 2);
                 }
             }
         }