From c58448edffd7bed0b70f07a05791dd6012ece757 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Tue, 13 Sep 2022 16:26:14 +0800
Subject: [PATCH] 1

---
 doc/_common.py         | 1 +
 webapp/models/Gun.php  | 8 +++++---
 webapp/models/Hero.php | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/_common.py b/doc/_common.py
index 440da83e..5683d5cd 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -91,6 +91,7 @@ class Gun(object):
             ['trade_locktime', 0, '出售锁定时间(升级或者升阶完成后触发),单位秒,只锁交易，其他的操作仍可进行'],
             ['chip_ids', '', '镶嵌的芯片主键id组'],
             ['!chip_core', [ChipCore()], '芯片核心加成'],
+            ['offer_reward_state', 0, '是否悬赏中'],
         ]
 
 class GunSkin(object):
diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index a27a3d80..8be30c73 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -136,9 +136,10 @@ class Gun extends BaseModel {
     public static function toDto($row)
     {
         $attr = emptyReplace(json_decode($row['rand_attr'], true), array());
-        $lockType = 0;
-        $unlockTime = 0;
-        if ($row['lock_type'] != 0 && $row['unlock_time'] - myself()->_getNowTime() > 0) {
+//        $lockType = 0;
+//        $unlockTime = 0;
+//        //if ($row['lock_type'] != 0 && $row['unlock_time'] - myself()->_getNowTime() > 0) {
+        {
             $lockType = $row['lock_type'];
             $unlockTime = $row['unlock_time'];
         }
@@ -195,6 +196,7 @@ class Gun extends BaseModel {
                                      $unlockTime - myself()->_getNowTime()),
             'unlock_trade_time' => $row['unlock_trade_time'],
             'chip_ids' => $row['chip_ids'],
+            'offer_reward_state' => 0,
         );
         $dto['ceg_uplimit'] = FormulaService::getWeaponPvpDailyCegUpLimit($dto);
         $dto['raw_pve_ceg_uplimit'] =
diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index 8a3fa3f8..ef624ae4 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -133,8 +133,10 @@ class Hero extends BaseModel {
             $lockType = $row['lock_type'];
             $unlockTime = $row['unlock_time'];
             }*/
-        $lockType = $row['lock_type'];
-        $unlockTime = $row['unlock_time'];
+        {
+            $lockType = $row['lock_type'];
+            $unlockTime = $row['unlock_time'];
+        }
 
         $qualityMeta = mt\HeroQuality::getByQuality($row['quality']);
         $todayGetGold = $row['today_get_gold'];