|
@@ -193,6 +193,7 @@ class OrderClass extends BaseClass
|
|
|
|
|
|
|
|
$current = time() + 300;
|
|
$current = time() + 300;
|
|
|
$data['deadline'] = isset($data['deadline']) ? $data['deadline'] : date("Y-m-d H:i:s", $current);
|
|
$data['deadline'] = isset($data['deadline']) ? $data['deadline'] : date("Y-m-d H:i:s", $current);
|
|
|
|
|
+ $data['sendTime'] = date("Y-m-d H:i:s");
|
|
|
$return = self::add($data, true);
|
|
$return = self::add($data, true);
|
|
|
return $return;
|
|
return $return;
|
|
|
}
|
|
}
|
|
@@ -535,11 +536,11 @@ class OrderClass extends BaseClass
|
|
|
$showItem = true;
|
|
$showItem = true;
|
|
|
|
|
|
|
|
//退款需要显示原有的花材结构,不考虑小菊的显示问题
|
|
//退款需要显示原有的花材结构,不考虑小菊的显示问题
|
|
|
- $getOriginalItem = Yii::$app->request->get('getOriginalItem',0);
|
|
|
|
|
- $getOriginalItem2 = Yii::$app->request->post('getOriginalItem',0);
|
|
|
|
|
- if($getOriginalItem == 1 || $getOriginalItem2 ==1){
|
|
|
|
|
|
|
+ $getOriginalItem = Yii::$app->request->get('getOriginalItem', 0);
|
|
|
|
|
+ $getOriginalItem2 = Yii::$app->request->post('getOriginalItem', 0);
|
|
|
|
|
+ if ($getOriginalItem == 1 || $getOriginalItem2 == 1) {
|
|
|
$showItem = self::getOriginalShowItem($showItem, $val);
|
|
$showItem = self::getOriginalShowItem($showItem, $val);
|
|
|
- }else{
|
|
|
|
|
|
|
+ } else {
|
|
|
$showItem = self::getShowItem($showItem, $val);
|
|
$showItem = self::getShowItem($showItem, $val);
|
|
|
}
|
|
}
|
|
|
|
|
|