|
@@ -55,13 +55,21 @@ class OrderExcelAdd extends Command {
|
55
|
55
|
$okStr = '';
|
56
|
56
|
|
57
|
57
|
for ($row = 2; $row <= $highestRow; ++$row) {
|
58
|
|
- $createTime = $worksheet->getCellByColumnAndRow(0, $row)->getValue();
|
|
58
|
+ $t = trim($worksheet->getCellByColumnAndRow(0, $row)->getValue());
|
|
59
|
+ $n = intval(($t - 25569) * 3600 * 24);
|
|
60
|
+ $createTime = gmdate('Y-m-d',$n);
|
59
|
61
|
$receiverName = trim($worksheet->getCellByColumnAndRow(1, $row)->getValue());
|
60
|
62
|
$receiverMobile = trim($worksheet->getCellByColumnAndRow(2, $row)->getValue());
|
61
|
63
|
$receiverAddress = trim($worksheet->getCellByColumnAndRow(3, $row)->getValue());
|
62
|
64
|
$goods_note = trim($worksheet->getCellByColumnAndRow(4, $row)->getValue());
|
63
|
65
|
$receivedAmount = trim($worksheet->getCellByColumnAndRow(5, $row)->getValue());
|
64
|
|
- $fanTime = trim($worksheet->getCellByColumnAndRow(7, $row)->getValue());
|
|
66
|
+ $f = trim($worksheet->getCellByColumnAndRow(7, $row)->getValue());
|
|
67
|
+ if(!empty($f)){
|
|
68
|
+ $n = intval(($f - 25569) * 3600 * 24);
|
|
69
|
+ $fanTime = gmdate('Y-m-d',$n);
|
|
70
|
+ }else{
|
|
71
|
+ $fanTime = '';
|
|
72
|
+ }
|
65
|
73
|
$is_fugou = trim($worksheet->getCellByColumnAndRow(8, $row)->getValue());
|
66
|
74
|
|
67
|
75
|
//数据库-新增数据
|
|
@@ -113,12 +121,12 @@ class OrderExcelAdd extends Command {
|
113
|
121
|
$order['paymentAccount'] = '18322225555'; // 付款账号,暂时默认写死
|
114
|
122
|
$order['paymentTime'] = $order['createTime']; // 付款时间
|
115
|
123
|
$order['warehouse'] = 0; //仓库
|
116
|
|
- $order['delivery_date'] = date('Y-m-d'); //发货日期
|
|
124
|
+ $order['delivery_date'] = $createTime; //发货日期
|
117
|
125
|
|
118
|
126
|
#更新客户表
|
119
|
127
|
$customer = array();
|
120
|
|
- $customers['name'] = $order['receiverName'];
|
121
|
|
- $customers['receiverAddress'] = $order['receiverAddress'];
|
|
128
|
+ $customers['name'] = $receiverName;
|
|
129
|
+ $customers['receiverAddress'] = $receiverAddress;
|
122
|
130
|
|
123
|
131
|
$if_e = DB::table('customers')->select('id')->where('phone', $order['receiverMobile'])->first();
|
124
|
132
|
if(isset($if_e->id)){
|
|
@@ -133,6 +141,7 @@ class OrderExcelAdd extends Command {
|
133
|
141
|
$order['admin_name'] = '测试账号';
|
134
|
142
|
$order['team_id'] = 4;
|
135
|
143
|
$res = DB::table('order')->insert($order);
|
|
144
|
+echo "\n行数:".$row. " 结果:".$res;
|
136
|
145
|
|
137
|
146
|
}
|
138
|
147
|
}
|