|
|
@@ -1644,30 +1644,35 @@ class Orders extends Auth {
|
|
|
->where('oc.id', $v['type'])
|
|
|
->field('ot.*')
|
|
|
->find();
|
|
|
- $createtime = strtotime($v['create_time']);
|
|
|
+ $xqtime = strtotime($v['xq_time']);
|
|
|
$curtime = time();
|
|
|
- $ct = round(($curtime - $createtime) / 60);
|
|
|
- if ($ct < $convey['yy_time']) {
|
|
|
- $ss = 0;
|
|
|
- }
|
|
|
- else {
|
|
|
- if ($ct >= $convey['yy_time'] && $ct < $convey['bz_time']) {
|
|
|
- $ss = 1;
|
|
|
+ if ($curtime > $xqtime) {
|
|
|
+ $ct = round(($curtime - $xqtime) / 60);
|
|
|
+ if ($ct < $convey['yy_time']) {
|
|
|
+ $ss = 0;
|
|
|
}
|
|
|
else {
|
|
|
- if ($ct >= $convey['bz_time'] && $ct < $convey['jg_time']) {
|
|
|
- $ss = 2;
|
|
|
+ if ($ct >= $convey['yy_time'] && $ct < $convey['bz_time']) {
|
|
|
+ $ss = 1;
|
|
|
}
|
|
|
else {
|
|
|
- if ($ct >= $convey['jg_time'] && $ct < $convey['wjjg_time']) {
|
|
|
- $ss = 3;
|
|
|
+ if ($ct >= $convey['bz_time'] && $ct < $convey['jg_time']) {
|
|
|
+ $ss = 2;
|
|
|
}
|
|
|
else {
|
|
|
- $ss = 4;
|
|
|
+ if ($ct >= $convey['jg_time'] && $ct < $convey['wjjg_time']) {
|
|
|
+ $ss = 3;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ $ss = 4;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ }else{
|
|
|
+ $ss = 0;
|
|
|
}
|
|
|
+
|
|
|
$v['ss'] = $ss;
|
|
|
$v['xtime'] = date('H:i', strtotime($v['xq_time']));
|
|
|
$v['stime'] = $v['send_time'] ? date('H:i', strtotime($v['send_time'])) : "";
|
