兼容新的表结构

TestFile/inbox/search_select.py

@@ -12,16 +12,22 @@ if not conversation_title:
     data = {"uid": searchtData.userId,"uType":2,"platform":1,"roomId":f"{searchtData.roomId}","clientId":f"{searchtData.willdesk_clientId}","event":"title","isMark":True,"title":f"{searchtData.insert_room_title}","allocationUid":searchtData.userId,"allocationName":f"{searchtData.name}","username":f"{searchtData.name}","v":f"{searchtData.v}"}
     res = requests.post(url='https://allplatformtest.sealapps.com/api/v1/chatRoom/operate',data=data,headers={'Authorization' : getattr(global_variate.Global,'access_token'),'User-Agent' : 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36'})
     conversation_title = searchtData.insert_room_title
-room_record_select_sql = f'select * from `im_record` where room_id = {searchtData.roomId}'
+room_record_select_sql = f'select * from `im_record` where room_id = {searchtData.roomId} and content like "%\\"contentList\\"%"'
 room_record_select_result = test_env_conn.select_one_value(sql=room_record_select_sql)
 if not room_record_select_result:
-    room_record_insert_sql = f'''INSERT INTO willdesk.im_record (room_id,msg_id,sender_uid,sender_uid_type,send_time,`type`,is_note,content,destruct_content,create_at,update_at,seq,msg_platform,msg_channel_type,from_id,channel_id,recipient_id,is_likes,offline_push,third_msg_id,reply_to_mid,reply_to_url,is_deleted,status,fail_reason) VALUES
-	 ({searchtData.roomId},5137338847398545645,{searchtData.customerId},1,1715738857039,11,0,"{searchtData.insert_record_json}","{searchtData.insert_room_chat_record}",1715738857,1715738857,'963422765235051','willdesk','wk','','','',0,0,NULL,NULL,NULL,0,1,NULL);
+    room_record_insert_sql = f'''INSERT INTO willdesk.im_record (room_id,msg_id,sender_uid,sender_uid_type,send_time,`type`,is_note,content,create_at,update_at,seq,msg_platform,msg_channel_type,from_id,channel_id,recipient_id,is_likes,offline_push,third_msg_id,reply_to_mid,reply_to_url,is_deleted,status,fail_reason) VALUES
+	 ({searchtData.roomId},5137338847398545645,{searchtData.customerId},1,1715738857039,11,0,"{searchtData.insert_record_json}",1715738857,1715738857,'963422765235051','willdesk','wk','','','',0,0,NULL,NULL,NULL,0,1,NULL);
 '''
     test_env_conn.execute_sql(sql=room_record_insert_sql)
     conversation_chat_record = searchtData.insert_room_chat_record
 else:
-    conversation_chat_record = room_record_select_result['destruct_content']
+    conversation_chat_record = room_record_select_result['content']
+    try:
+        conversation_chat_record = str(eval(conversation_chat_record)['contentList'])
+        if '<br>' in conversation_chat_record:
+            conversation_chat_record = conversation_chat_record.replace('<br>', '')
+    except Exception as e:
+        pass
 setattr(searchtData, 'conversation_title', conversation_title)
 setattr(searchtData, 'conversation_chat_record', conversation_chat_record)
 setattr(searchtData, 'conversation_id', str(conversation_id))

YamlCase/billing/buyPlan.yaml

@@ -44,7 +44,7 @@ api5:
   data: {"v":"${v}"}
   expected:
     - eq: {"$.code": 0}
-    - eq: {"$.data.discount": 5.1}
+#    - eq: {"$.data.discount": 5.1}
 
 api6:
   title: 购买付费套餐 - 检查是否返回shopify付款链接
@@ -69,3 +69,12 @@ api7:
     - eq: { "$.data.companyBasicPlanItem[?(@.itemId == 3)].amount": -1 }
     - eq: { "$.data.createAtFormat": "${today}" }
     - eq: { "$.data.expireAtFormat": "${next_month}" }
+
+api8:
+  title: 买WhatsApp一次性额度
+  url: api/v1/businessPlan/buyOneTimePlan
+  method: post
+  data: {"shopId":"${shopId}","planId":2,"v":"${v}"}
+  expected:
+    - eq: {"$.code": 0}
+    - in: { "$.data.confirmationUrl" : "https://zhs-test.myshopify.com/admin/charges/4794771/"}