Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer into cheng

Controller/UnicomCombo/WXTechController.py

@@ -269,7 +269,7 @@ class WXTechController(View):
                     return response.json(444)  # 参数缺失
                 # 校验兑换码格式是否正确
                 if not (code.isalnum() and len(code) == 10):
-                    return response.json(10040)  # 兑换码格式错误
+                    return response.json(10067)  # 兑换码格式错误
                 device_info_qs = UnicomDeviceInfo.objects.filter(serial_no=serial_number) \
                     .values('iccid', 'card_type')
                 if not device_info_qs.exists():
@@ -278,7 +278,7 @@ class WXTechController(View):
                 exchange_code_qs = ExchangeCode.objects.filter(code=code, status=False) \
                     .values('package_id', 'expire_time', 'package_type')
                 if not exchange_code_qs.exists():
-                    return response.json(10040)  # 兑换码无效
+                    return response.json(10066)  # 兑换码无效
                 combo_id = exchange_code_qs[0]['package_id']
                 # 获取五兴套餐套餐编码
                 package_info_qs = UnicomCombo.objects.filter(id=combo_id, is_del=False) \
@@ -294,8 +294,8 @@ class WXTechController(View):
                                                          user_id, combo_id)
                     if result:
                         exchange_code_qs.update(status=True, updated_time=int(time.time()))
-                        cls.save_log(ip, 200, '兑换成功{},{}'.format(serial_number, code))
-                        return response.json(0)
+                        cls.save_log(ip, 10065, '兑换成功{},{}'.format(serial_number, code))
+                        return response.json(10065)
                 elif card_type == 1:  # 五兴电信无限流量兑换码
                     # 五兴订购流量包请求参数
                     data = {'iccid': iccid, 'operator': WXOperatorEnum.TELECOM.value,
@@ -308,10 +308,10 @@ class WXTechController(View):
                         trade_no = res['data']['orderNumber']
                         cls.created_order(serial_number, user_id, trade_no, combo_id, 11)
                         exchange_code_qs.update(status=True, updated_time=int(time.time()))
-                        cls.save_log(ip, 200, '兑换成功{},{}'.format(serial_number, code))
-                        return response.json(0)
-                cls.save_log(ip, 10040, '兑换失败{},{}'.format(serial_number, code))
-                return response.json(10040)
+                        cls.save_log(ip, 10065, '兑换成功{},{}'.format(serial_number, code))
+                        return response.json(10065)
+                cls.save_log(ip, 10068, '兑换失败{},{}'.format(serial_number, code))
+                return response.json(10068)
             except Exception as e:
                 LOGGER.info('*****WXTechController.wx_exchange_package:errLine:{}, errMsg:{}'
                             .format(e.__traceback__.tb_lineno, repr(e)))

Object/ResponseObject.py

@@ -131,6 +131,10 @@ class ResponseObject(object):
             10062: 'This device has experienced the package',
             10063: 'Failed to claim',
             10064: 'If the claim fails, please contact customer service',
+            10065: 'The redemption is successful and can be viewed in Settings-4G-My Package',
+            10066: 'This code has been redeemed and can be viewed in Settings-4G-My Package',
+            10067: 'Invalid redemption code',
+            10068: 'This device does not support redemption, please contact customer service'
         }
         data_cn = {
             0: '成功',
@@ -252,6 +256,10 @@ class ResponseObject(object):
             10062: '此设备已体验过套餐',
             10063: '领取失败',
             10064: '领取失败,请联系客服',
+            10065: '\t兑换成功\n可在设置-4G-我的套餐中查看',
+            10066: '\t此码已兑换\n可在设置-4G-我的套餐中查看',
+            10067: '无效兑换码',
+            10068: '兑换失败,请联系客服'
         }
 
         msg = data_cn if self.lang == 'cn' or self.lang == 'zh-Hans' or self.lang == 'zh-Hant' else data_en