diff --git a/app/controller/Zone.php b/app/controller/Zone.php index 447a027..7c5e70d 100644 --- a/app/controller/Zone.php +++ b/app/controller/Zone.php @@ -72,7 +72,7 @@ class Zone extends BaseController if (!$res['status']) return $this->renderError($res['msg']); return $this->renderSuccess( - $res['awards_amount'] > 0 ? '未中奖' : '恭喜你中奖了', + $res['awards_amount'] > 0 ? '恭喜你中奖了' : '未中奖', ['awards_amount' => $res['awards_amount']] ); } diff --git a/app/logic/Zone.php b/app/logic/Zone.php index c93bcbb..842bc3a 100644 --- a/app/logic/Zone.php +++ b/app/logic/Zone.php @@ -89,18 +89,20 @@ class Zone # 验证 $queryWhere = ['status' => 0, 'user_id' => $user_id, 'id' => $c_r_id]; $zoneOrderModel = new ConsumptionRecords(); - $query = $zoneOrderModel->where($queryWhere)->field('data,zone_goods_id')->find(); - if (!$query) return ['status' => 0, 'msg' => '刮奖异常']; + $query = $zoneOrderModel->where($queryWhere)->field('text_data,zone_goods_id')->find(); + if (!$query) return ['status' => 0, 'msg' => '刮奖结果已公布']; # 解密 - $data = unserialize($query['data']); + $data = unserialize($query['text_data']); # 解析是否中奖 $awards_amount = 0; foreach ($data as $goodsParam) { - $awardsAmountRes = ZoneGoodsParam::getAwardsAmount($goodsParam['id']); - if ($awardsAmountRes) { - $awards_amount += $goodsParam['amount']; + foreach ($goodsParam as $item) { + $awardsAmountRes = ZoneGoodsParam::getAwardsAmount($item['id']); + if ($awardsAmountRes) { + $awards_amount += $item['amount']; + } } } diff --git a/app/model/AwardsRecords.php b/app/model/AwardsRecords.php index 35b0cdf..9e41371 100644 --- a/app/model/AwardsRecords.php +++ b/app/model/AwardsRecords.php @@ -19,7 +19,7 @@ class AwardsRecords extends Model */ public static function createRecords($user_id,$cr_id,$amount,$balance) { - $records = new ConsumptionRecords(); + $records = new AwardsRecords(); $records->user_id = $user_id; $records->cr_id = $cr_id; diff --git a/app/model/User.php b/app/model/User.php index b848744..d4870a6 100644 --- a/app/model/User.php +++ b/app/model/User.php @@ -198,7 +198,8 @@ class User extends Model public static function decrBalance($user_id,$balance) { $user = self::find($user_id); - $user->balance = round($user->balance + $balance,2); + $user->balance = round($user->balance - $balance,2); + $user->withdrawal_balence = $user->balance; $user->save(); return $user->balance; } @@ -215,7 +216,8 @@ class User extends Model public static function IncrBalance($user_id,$balance) { $user = self::find($user_id); - $user->balance = round($user->balance - $balance,2); + $user->balance = round($user->balance + $balance,2); + $user->withdrawal_balence = $user->balance; $user->save(); return $user->balance; }