Ver código fonte

fix: 挖礦總數顯示錯誤,退款警告

joe 4 anos atrás
pai
commit
600c198bec

+ 2 - 0
app/api/controller/coin/UserCoinController.php

@@ -47,6 +47,8 @@ class UserCoinController {
         if ($mymining['progress'] > 0.0) {
             $mymining = $this->calcMining($uid, $mymining);
             UserHash::mining_set($uid, $mymining);
+        } else {
+            $mymining['total'] = UserCoin::where('uid', $uid)->where('symbol', $symbol)->value('balance') ?? 0.0;
         }
         return app('json')->successful([
             'symbol' => $mymining['symbol'],

+ 1 - 0
app/models/store/StoreOrder.php

@@ -509,6 +509,7 @@ class StoreOrder extends BaseModel
         $cartInfo = StoreOrderCartInfo::where('cart_id', 'in', $order['cart_id'])->select();
         $cartInfo = $cartInfo ? $cartInfo->toArray() : [];
         foreach ($cartInfo as $cart) {
+            $cart['cart_info'] = json_decode($cart['cart_info'], true);
             //增库存减销量
             if ($combinationId) $res5 = $res5 && StoreCombination::incCombinationStock($cart['cart_info']['cart_num'], $combinationId, isset($cart['cart_info']['productInfo']['attrInfo']) ? $cart['cart_info']['productInfo']['attrInfo']['unique'] : '');
             else if ($seckill_id) $res5 = $res5 && StoreSeckill::incSeckillStock($cart['cart_info']['cart_num'], $seckill_id, isset($cart['cart_info']['productInfo']['attrInfo']) ? $cart['cart_info']['productInfo']['attrInfo']['unique'] : '');