Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/admin/logic/GoodGroupItemLogic.php

@@ -144,7 +144,7 @@ class GoodGroupItemLogic extends BaseLogic
                 ->update([
                     'updatetime' => date('Y-m-d H:i:s'),
                     'updaterid' => self::$uid,
-                    'updater' => self::$uid
+                    'updater' => self::$uname
                 ]);
 
             Db::commit();

app/admin/logic/GoodGroupLogic.php

@@ -103,7 +103,7 @@ class GoodGroupLogic extends BaseLogic
         $date = date('Y-m-d H:i:s');
 
         $res = GoodGroupModel::where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
-            ->save(array_merge($data, ['updatetime' => $date, 'updaterid' => self::$uid, 'updater' => self::$uid]));
+            ->save(array_merge($data, ['updatetime' => $date, 'updaterid' => self::$uid, 'updater' => self::$uname]));
 
         return $res ? json_show(CommonModel::$success, '编辑商品分组成功') : json_show(CommonModel::$success, '编辑商品分组失败');
 
@@ -118,7 +118,7 @@ class GoodGroupLogic extends BaseLogic
                 'status' => $data['status'],
                 'updatetime' => date('Y-m-d H:i:s'),
                 'updaterid' => self::$uid,
-                'updater' => self::$uid
+                'updater' => self::$uname
             ]);
 
         return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败');
@@ -138,7 +138,7 @@ class GoodGroupLogic extends BaseLogic
                     'is_del' => CommonModel::$del_deleted,
                     'updatetime' => date('Y-m-d H:i:s'),
                     'updaterid' => self::$uid,
-                    'updater' => self::$uid
+                    'updater' => self::$uname
                 ]);
 
             if (!$res) throw new Exception('该商品分组不存在');

app/admin/logic/InventoryExchangeLogic.php

@@ -147,7 +147,7 @@ class InventoryExchangeLogic extends BaseLogic
             }
 
             InventoryExchangeModel::where('id', $data['id'])
-                ->save(array_merge($data, ['updatetime' => $date, 'updaterid' => self::$uid, 'updater' => self::$uid]));
+                ->save(array_merge($data, ['updatetime' => $date, 'updaterid' => self::$uid, 'updater' => self::$uname]));
 
             Db::commit();
 

app/admin/logic/ServiceLogic.php

@@ -103,7 +103,7 @@ class ServiceLogic extends BaseLogic
         $date = date('Y-m-d H:i:s');
 
         $res = ServiceModel::where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
-            ->save(array_merge($data, ['updatetime' => $date, 'updaterid' => self::$uid, 'updater' => self::$uid]));
+            ->save(array_merge($data, ['updatetime' => $date, 'updaterid' => self::$uid, 'updater' => self::$uname]));
 
         return $res ? json_show(CommonModel::$success, '编辑服务成功') : json_show(CommonModel::$success, '编辑服务失败');
 
@@ -118,7 +118,7 @@ class ServiceLogic extends BaseLogic
                 'status' => $data['status'],
                 'updatetime' => date('Y-m-d H:i:s'),
                 'updaterid' => self::$uid,
-                'updater' => self::$uid
+                'updater' => self::$uname
             ]);
 
         return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '该服务不存在或重复操作');
@@ -138,7 +138,7 @@ class ServiceLogic extends BaseLogic
                     'is_del' => CommonModel::$del_deleted,
                     'updatetime' => date('Y-m-d H:i:s'),
                     'updaterid' => self::$uid,
-                    'updater' => self::$uid
+                    'updater' => self::$uname
                 ]);
 
             if (!$res) throw new Exception('该服务不存在');

app/admin/logic/VideoGroupLogic.php

@@ -105,7 +105,7 @@ class VideoGroupLogic extends BaseLogic
         }
 
         $res = VideoGroupModel::where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
-            ->save(array_merge($data, ['updatetime' => date('Y-m-d H:i:s'), 'updaterid' => self::$uid, 'updater' => self::$uid]));
+            ->save(array_merge($data, ['updatetime' => date('Y-m-d H:i:s'), 'updaterid' => self::$uid, 'updater' => self::$uname]));
 
         return $res ? json_show(CommonModel::$success, '编辑视频分组成功') : json_show(CommonModel::$error_param, '编辑视频分组失败');
 
@@ -120,7 +120,7 @@ class VideoGroupLogic extends BaseLogic
                 'status' => $data['status'],
                 'updatetime' => date('Y-m-d H:i:s'),
                 'updaterid' => self::$uid,
-                'updater' => self::$uid
+                'updater' => self::$uname
             ]);
 
         return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败，该视频分组不存在或重复操作');
@@ -139,7 +139,7 @@ class VideoGroupLogic extends BaseLogic
                     'is_del' => CommonModel::$del_deleted,
                     'updatetime' => date('Y-m-d H:i:s'),
                     'updaterid' => self::$uid,
-                    'updater' => self::$uid
+                    'updater' => self::$uname
                 ]);
 
             Db::name('video_group_item')
@@ -167,7 +167,7 @@ class VideoGroupLogic extends BaseLogic
                 'is_top' => $data['is_top'],
                 'updatetime' => date('Y-m-d H:i:s'),
                 'updaterid' => self::$uid,
-                'updater' => self::$uid
+                'updater' => self::$uname
             ]);
 
         return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败，该视频分组不存在或重复操作');