diff --git a/third_party/j7 b/third_party/j7 index f98d9e8d..7533a5e7 160000 --- a/third_party/j7 +++ b/third_party/j7 @@ -1 +1 @@ -Subproject commit f98d9e8dfb0575f3c42795163bfbaa5c807a5935 +Subproject commit 7533a5e7ed287378d33cb1bc3244487d33de7951 diff --git a/third_party/phpcommon b/third_party/phpcommon index 571b6c46..848e05c0 160000 --- a/third_party/phpcommon +++ b/third_party/phpcommon @@ -1 +1 @@ -Subproject commit 571b6c46137597d3bede13989e284130a070bea0 +Subproject commit 848e05c01f44622e52996bb04dfb6b344acce1b8 diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index af84d3af..d680e9a3 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -137,7 +137,10 @@ class ShopController extends BaseAuthedController { $price_array = splitStr1($row['price']); $discount_array = splitStr1($row['discount']); - + $discount_begin = $row['discount_begin']; + $discount_end = $row['discount_end']; + $nowTime = $this->_getNowTime(); + $need_price = $price_array[$token_pos]; $discount = $discount_array[$token_pos];