4G赠送套餐userName字段改为userId

AdminController/UnicomManageController.py

@@ -453,10 +453,10 @@ class UnicomManageControllerView(View):
         @param response: 响应对象
         @param return:
         """
-        userName = request_dict.get('userName', None)
+        userId = request_dict.get('userId', None)
         serialNo = request_dict.get('serialNo', None)
         comboId = request_dict.get('comboId', None)
-        if not all([userName, serialNo, comboId]):
+        if not all([userId, serialNo, comboId]):
             return response.json(444)
         try:
             while transaction.atomic():
@@ -464,10 +464,8 @@ class UnicomManageControllerView(View):
                     .values('id', 'combo_name', 'price', 'virtual_price', 'remark', 'combo_type').order_by('sort')
                 if not combo_info_qs.exists():
                     return response.json(173)
-                device_user_qs = Device_User.objects.filter(username=userName).values('userID')
-                userID = device_user_qs[0]['userID'] if device_user_qs.exists() else ''
                 unicom_device_info_qs = UnicomDeviceInfo.objects.filter(serial_no=serialNo,
-                                                                        user_id=userID).values \
+                                                                        user_id=userId).values \
                     ('user_id', 'iccid', 'serial_no')
                 if not unicom_device_info_qs.exists():
                     return response.json(173)
@@ -478,7 +476,7 @@ class UnicomManageControllerView(View):
                 unicom_combo = UnicomComboView.create_combo_order_info(order_id=order_id, activate_type=1, iccid=icc_id,
                                                                        combo_id=comboId)
                 if unicom_combo is False:
-                    return False
+                    return response.json(178)
                 # 获取套餐信息
                 combo_info_vo = combo_info_qs[0]
                 c_time = n_time
@@ -486,7 +484,7 @@ class UnicomManageControllerView(View):
                 uid = CommonService.query_uid_with_serial(serial_no)
                 rank_id, ai_rank_id = UnicomComboView.get_cloud_or_ai_combo()  # 生成订单必须添加该字段
                 order_dict = {'orderID': order_id, 'UID': uid, 'rank_id': rank_id, 'ai_rank_id': ai_rank_id,
-                              'userID_id': userID, 'desc': combo_info_vo['combo_name'], 'payType': 10,
+                              'userID_id': userId, 'desc': combo_info_vo['combo_name'], 'payType': 10,
                               'payTime': c_time, 'price': combo_info_vo['price'], 'addTime': c_time,
                               'updTime': c_time, 'status': 1,
                               'unify_combo_id': str(combo_info_vo['id']), 'order_type': 2,