Merge branch 'group_0313'

app/adminapi/logic/works/GroupServiceWorkLogic.php

@@ -482,7 +482,7 @@ class GroupServiceWorkLogic extends BaseLogic
             }
             
             if ($params['num'] > $order['num']) {
-                throw new \Exception('退款数量不能大于:'.$work->num);
+                throw new \Exception('退款数量不能大于:'.$order['num']);
             }
             die;
             //全退

app/api/logic/GroupActivityLogic.php

@@ -203,7 +203,6 @@ class GroupActivityLogic extends BaseLogic
 
             //生成用户拼单订单
             $data = [
-                'sn' => generate_sn(groupUserOrder::class, 'sn'),
                 'mobile' => $params['mobile'],
                 'group_order_id' => $groupOrder['id'],
                 'group_activity_id' => $params['group_activity_id'],
@@ -220,6 +219,7 @@ class GroupActivityLogic extends BaseLogic
                 $data['update_time'] = $data['delete_time'] = null;
                 GroupUserOrder::where('id',$userOrder['id'])->update($data); 
             } else {
+                $data['sn'] = generate_sn(groupUserOrder::class, 'sn');
                 $userOrder = GroupUserOrder::create($data);    
             }
             Db::commit();