|
@@ -120,11 +120,10 @@ class GoodsController extends Controller
|
120
|
120
|
$mjArr['outerCode'] = $res;
|
121
|
121
|
|
122
|
122
|
//sku
|
123
|
|
- $sku = trim($request->input('sku'),';');
|
|
123
|
+ $sku = $request->input('sku');
|
124
|
124
|
if(!empty($sku)){
|
125
|
|
- $sku = explode(';', $sku);
|
126
|
125
|
foreach($sku as $key=>$item){
|
127
|
|
- $sku_data = explode(',', $item);
|
|
126
|
+ $sku_data = explode('@@', $item);
|
128
|
127
|
$sku_insert_data = $mjArr['skuList'][$key] = ['propsName'=>$sku_data[0], 'price'=>$sku_data[1], 'createTime'=>date('Y-m-d H:i:s'), 'modifyTime'=>date('Y-m-d H:i:s')];
|
129
|
128
|
$sku_insert_data['goodsCode'] = $res;
|
130
|
129
|
$sku_insert_data['eshopCode'] = '99|34881';
|
|
@@ -133,9 +132,12 @@ class GoodsController extends Controller
|
133
|
132
|
$mjArr['skuList'][$key]['outerCode'] = $sku_ids;
|
134
|
133
|
}
|
135
|
134
|
}
|
136
|
|
- exit;
|
|
135
|
+
|
137
|
136
|
//对接卖家云
|
138
|
|
- $mj = Order::mjGoodsAdd($mjArr);
|
|
137
|
+ //$mj = Order::mjGoodsAdd($mjArr);
|
|
138
|
+ /* 同步卖家云商品code等信息 */
|
|
139
|
+
|
|
140
|
+ /* end */
|
139
|
141
|
#记录操作日志
|
140
|
142
|
$self_id = session('admin_id');
|
141
|
143
|
$self_name = session('real_name');
|
|
@@ -160,11 +162,11 @@ class GoodsController extends Controller
|
160
|
162
|
{
|
161
|
163
|
|
162
|
164
|
$data = Goods::where('id', $id)->first();
|
163
|
|
- $teamList = DB::table('teams')->select('id', 'name')->get();
|
164
|
|
- $teamList = json_decode(json_encode($teamList), true);
|
165
|
|
- return view('goods/edit', [
|
|
165
|
+ $sku = GoodsSkus::where('goodsCode', $id)->where('is_del', 0)->get();
|
|
166
|
+ return view('goods/edit', [
|
166
|
167
|
'goods' => $data,
|
167
|
|
- 'teamlist' => $teamList,
|
|
168
|
+ 'sku_list' => $sku,
|
|
169
|
+ 'id' => $id,
|
168
|
170
|
]);
|
169
|
171
|
|
170
|
172
|
}
|
|
@@ -176,41 +178,76 @@ class GoodsController extends Controller
|
176
|
178
|
*/
|
177
|
179
|
public function update(Request $request)
|
178
|
180
|
{
|
179
|
|
- $name = (int)$request->input('name');
|
180
|
|
- $id = (int)$request->input('id');
|
181
|
|
- $this->validate($request, [
|
182
|
|
- 'id' => 'required',
|
183
|
|
- '_cost' => 'required',
|
184
|
|
- '_fan_add' => 'required',
|
185
|
|
- 'name' => 'required',
|
186
|
|
- 'createTime' => 'required|unique:cust_day_,createTime,'.$id.',id,name,'.$name,
|
187
|
|
- ], [
|
188
|
|
- 'id.required' => 'id不能为空',
|
189
|
|
- '_cost.required' => '总成本不能为空',
|
190
|
|
- '_fan_add.required' => '总加粉数不能为空',
|
191
|
|
- 'name.required' => '团队不能为空',
|
192
|
|
- 'createTime.required' => '日期不能为空',
|
193
|
|
- 'createTime.unique' => '指定日期已存在',
|
|
181
|
+ $id = (int)$request->input('id');
|
|
182
|
+ $this->validate($request, [
|
|
183
|
+ 'id' => 'required',
|
|
184
|
+ 'name' => 'required',
|
|
185
|
+ 'productCode' => 'required',
|
|
186
|
+ ], [
|
|
187
|
+ 'id' => '非法操作',
|
|
188
|
+ 'name.required' => '商品名不能为空',
|
|
189
|
+ 'productCode.required' => '商品货号不能为空',
|
194
|
190
|
]);
|
195
|
|
-
|
196
|
|
- $goods = array();
|
197
|
|
- $goods['_cost'] = $request->input('_cost');
|
198
|
|
- $goods['_fan_add'] = $request->input('_fan_add');
|
199
|
|
- $goods['createTime'] = $request->input('createTime');
|
200
|
|
- $goods['name'] = $name;
|
201
|
191
|
|
202
|
|
- $res = DB::table('cust_day_')->where('id', $id)->update($goods);
|
|
192
|
+ $del_sku_ids = trim($request->input('del_sku_ids'),',');
|
|
193
|
+ $sku = $request->input('sku');
|
|
194
|
+ //数据库-修改数据
|
|
195
|
+ $goods = array();
|
|
196
|
+ $goods['name'] = trim($request->input('name'));
|
|
197
|
+ $goods['description'] = trim($request->input('description')); //非必填
|
|
198
|
+ $goods['productCode'] = trim($request->input('productCode'));
|
|
199
|
+ //图片上传 阿里云oss
|
|
200
|
+ if ($request->hasFile('img') && $request->file('img')->isValid()) {
|
|
201
|
+ $file = $request->file('img');
|
|
202
|
+ $ossClient=new oss();
|
|
203
|
+ // 上传阿里云
|
|
204
|
+ $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
|
|
205
|
+ $img=$file['oss-request-url'];
|
|
206
|
+ $goods['picUrl']=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
|
|
207
|
+ }
|
|
208
|
+
|
|
209
|
+ $res = DB::table('goods')->where('id', $id)->update($goods);
|
203
|
210
|
if($res){
|
|
211
|
+ //卖家云必要参数拼接转化
|
|
212
|
+ $mjArr = $goods;
|
|
213
|
+ $mjArr['outerCode'] = $id;
|
|
214
|
+
|
204
|
215
|
#记录操作日志
|
205
|
216
|
$self_id = session('admin_id');
|
206
|
|
- $self_name = session('real_name');
|
207
|
|
- $context = "修改运营上报数据";
|
|
217
|
+ $self_name = session('real_name');
|
|
218
|
+ $context = "修改商品数据";
|
208
|
219
|
$type = 0;
|
209
|
|
- $tables = 'cust_day_';
|
|
220
|
+ $tables = 'goods,goods_skus';
|
210
|
221
|
$data_id = $id;
|
211
|
222
|
Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
|
212
|
|
- }
|
213
|
|
- return redirect('/admin/goods/index')->with('info', '更新成功');
|
|
223
|
+
|
|
224
|
+ }elseif( empty($del_sku_ids) && empty($sku) ){
|
|
225
|
+ return redirect('/admin/goods/index')->with('info', '未做任何修改');
|
|
226
|
+ }
|
|
227
|
+
|
|
228
|
+ if(!empty($sku)){
|
|
229
|
+ foreach($sku as $key=>$item){
|
|
230
|
+ $sku_data = explode('@@', $item);
|
|
231
|
+ $sku_insert_data = $mjArr['skuList'][$key] = ['propsName'=>$sku_data[0], 'price'=>$sku_data[1], 'createTime'=>date('Y-m-d H:i:s'), 'modifyTime'=>date('Y-m-d H:i:s')];
|
|
232
|
+ $sku_insert_data['goodsCode'] = $id;
|
|
233
|
+ $sku_insert_data['eshopCode'] = '99|34881';
|
|
234
|
+ $sku_ids = DB::table('goods_skus')->insertGetId($sku_insert_data);
|
|
235
|
+
|
|
236
|
+ $mjArr['skuList'][$key]['outerCode'] = $sku_ids;
|
|
237
|
+ }
|
|
238
|
+ }
|
|
239
|
+ if(!empty($del_sku_ids)){
|
|
240
|
+ $del_sku_ids = explode(',', $del_sku_ids);
|
|
241
|
+ $del_res = GoodsSkus::whereIn('id', $del_sku_ids)->update(['is_del'=>1]);
|
|
242
|
+ }
|
|
243
|
+
|
|
244
|
+ //对接卖家云
|
|
245
|
+ //$mj = Order::mjGoodsAdd($mjArr);
|
|
246
|
+ /* 同步卖家云商品code等信息 */
|
|
247
|
+
|
|
248
|
+ /* end */
|
|
249
|
+
|
|
250
|
+ return redirect('/admin/goods/index')->with('info', '更新成功');
|
214
|
251
|
}
|
215
|
252
|
|
216
|
253
|
/**
|