diff --git a/2-Web/SiteActivity/SiteActivity.robot b/2-Web/SiteActivity/SiteActivity.robot
index a542293..19e25dc 100644
--- a/2-Web/SiteActivity/SiteActivity.robot
+++ b/2-Web/SiteActivity/SiteActivity.robot
@@ -4,5 +4,6 @@ Resource SiteActivityResources.robot
*** Test Cases ***
创建助力活动
- 获取婚介平台社群信息
- 创建婚介平台活动
+ Given 获取婚介平台社群信息
+ And 获取婚介收费项
+ Then 创建婚介平台活动
diff --git a/2-Web/SiteActivity/SiteActivityResources.robot b/2-Web/SiteActivity/SiteActivityResources.robot
index d0ab891..6b42210 100644
--- a/2-Web/SiteActivity/SiteActivityResources.robot
+++ b/2-Web/SiteActivity/SiteActivityResources.robot
@@ -14,6 +14,7 @@ Library DatabaseLibrary
${reps} GET On Session dating dating-agency-service/user/get/association/page params=pageSize=100&enable=true&pageNum=1
${records} Get From Dictionary ${reps.json()['data']} records #社群数组
Set Global Variable ${records} #设置全局变量
+ Set Global Variable ${admin_header}
Run Keyword If ${records}==[] 创建婚介社群
... ELSE 随机获取社群信息
${reps} GET On Session dating dating-agency-service/user/get/association/detail params=id=${communityId}
@@ -29,21 +30,39 @@ Library DatabaseLibrary
#创建社群
FOR ${admin_header} IN @{Aheader_list}
Create Session dating ${${dating}.dating域名} ${admin_header}
- ${DateTime} Get Current Date result_format%Y-%m-%d #获取年月日
- ${Time} Get Current Date result_format%Y%m%d%H%M%S #获取时间戳
+ ${DateTime} Get Current Date result_format=%Y-%m-%d #获取年月日
+ ${Time} Get Current Date result_format=%Y%m%d%H%M%S #获取时间戳
${data} Set Variable {"name":"测试社群${DateTime}","communityCode":"${Time}","depict":"测试社群${DateTime}","coverUrlList":["https://dating-agency-test.oss-accelerate.aliyuncs.com/cloudprint_b9daff2e-eb00-47c7-b4d0-3067c66247e9.png"],"communityQrCodeUrlList":["https://dating-agency-test.oss-accelerate.aliyuncs.com/fc1a3fd43fedbf527e344ef3e652e62.jpg"],"contactPictureUrlList":["https://dating-agency-test.oss-accelerate.aliyuncs.com/9c8c0fb5b9c22bf0124f12ff0120f22.jpg"]}
${reps} POST On Session dating dating-agency-service/user/create/association ${data.encode('utf-8')}
${message} Get From Dictionary ${reps.json()} message
Should Be Equal As Strings ${message} successful #断言
+ 查询婚介社群列表
+ END
+
+查询${dating}社群列表
+ FOR ${admin_header} IN @{Aheader_list}
+ Create Session dating ${${dating}.dating域名} ${admin_header}
+ ${reps} GET On Session dating dating-agency-service/user/get/association/page params=pageSize=100&pageNum=1
+ ${records} Get From Dictionary ${reps.json()['data']} records #社群数组
+ Set Global Variable ${records} #设置全局变量
随机获取社群信息
END
随机获取社群信息
${communityData} Evaluate random.choice(${records}) random #随机获取一个社群
+ ${enable} Get From Dictionary ${communityData} enable #启停状态
${communityId} Get From Dictionary ${communityData} id #社群id
${communityName} Get From Dictionary ${communityData} name #社群name
Set Global Variable ${communityId}
Set Global Variable ${communityName}
+ Run Keyword If ${enable}==False 启用婚介社群
+
+启用${dating}社群
+ Create Session dating ${${dating}.dating域名} ${admin_header}
+ ${data} Set Variable {"id":"${communityId}"}
+ ${reps} POST On Session dating dating-agency-service/user/enable/association ${data.encode('utf-8')}
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
查询${dating}平台商品定价列表
#商品定价列表
@@ -93,6 +112,32 @@ Library DatabaseLibrary
Set Global Variable ${activityId}
Set Global Variable ${activeState}
+获取${dating}收费项
+ #获取收费项
+ ${goodsName_list} Create List
+ ${vipActivityId_list} Create List
+ FOR ${admin_header} IN @{Aheader_list}
+ Create Session dating ${${dating}.dating域名} ${admin_header}
+ ${reps} GET On Session dating dating-agency-mall/user/page/product/by/operator params=pageSize=100&enable=true&activeState=1&pageNum=1
+ ${records} Get From Dictionary ${reps.json()['data']} records #商品定价列表
+ ${productData} Evaluate random.choice(${records}) random #随机获取商品
+ ${productId} Get From Dictionary ${productData} productId #商品名称
+ ${productTitle} Get From Dictionary ${productData} productTitle #商品名称
+ Append To List ${goodsName_list} ${productTitle}
+ Append To List ${vipActivityId_list} ${productId}
+ ${reps} GET On Session dating dating-agency-mall/user/get/activity/by/operator/page params=pageSize=100&enable=true&activeState=1&pageNum=1
+ ${records} Get From Dictionary ${reps.json()['data']} records #会员收费列表
+ ${memberData} Evaluate random.choice(${records}) random #随机获取会员收费信息
+ ${activityId} Get From Dictionary ${memberData} id #会员活动id
+ ${activityName} Get From Dictionary ${memberData} activityName #会员活动name
+ Append To List ${goodsName_list} ${activityName}
+ Append To List ${vipActivityId_list} ${activityId}
+ ${goodsName} Evaluate random.choice(${goodsName_list}) random #随机获取收费项name
+ ${vipActivityId} Evaluate random.choice(${vipActivityId_list}) random #随机获取收费项id
+ Set Global Variable ${goodsName}
+ Set Global Variable ${vipActivityId}
+ END
+
创建${dating}平台活动
#创建活动
region
@@ -127,7 +172,7 @@ Library DatabaseLibrary
${numberParticipants} Evaluate ${numberWoman}+${numberMan} #总人数=女士人数+男士人数
${activityType} Evaluate "".join(random.sample("01",1)) random,string #活动类型，1线上，0线下
${realNameSwitch} Set Variable false #参与活动是否需要实名
- ${AvtivityData} Set Variable If ${activityType}==0 {"applyStartTime":"${applyStartTime}","name":"${DateTime}测试活动","activityType":${activityType},"applyEndTime":"${applyEndTime}","beginTime":"${beginTime}","endTime":"${endTime}","detailedAddress":"报名后拉群发详细地址","communityId":null,"communityName":null,"imgList":[{"url":"https://dating-agency-test.oss-accelerate.aliyuncs.com/微信图片_20240412144009.png"}],"depict":"${DateTime}测试活动","contactPictureUrl":null,"communityQrCodeUrl":null,"provinceCode":${provinceCode},"cityCode":${cityCode},"districtCode":${districtCode},"provinceName":"${provinceName}","cityName":"${districtName}","districtName":"${cityName}","mutualAssistanceLimit":0,"numberParticipants":${numberParticipants},"numberMan":${numberMan},"numberWoman":${numberWoman},"participationAllocations":${participationAllocations},"realNameSwitch":${realNameSwitch}} {"applyStartTime":"${applyStartTime}","name":"${DateTime}测试活动","activityType":${activityType},"applyEndTime":"${applyEndTime}","beginTime":"${beginTime}","endTime":"${endTime}","detailedAddress":"","communityId":"${communityId}","communityName":"${communityName}","imgList":[{"url":"https://dating-agency-test.oss-accelerate.aliyuncs.com/微信图片_20240412144009.png"}],"depict":"${DateTime}测试活动","contactPictureUrl":"${contactPictureUrl}","communityQrCodeUrl":"${communityQrCodeUrl}","mutualAssistanceLimit":0,"numberParticipants":${numberParticipants},"numberMan":${numberMan},"numberWoman":${numberWoman},"participationAllocations":${participationAllocations},"realNameSwitch":${realNameSwitch}} #活动数据
+ ${AvtivityData} Set Variable If ${activityType}==0 {"realNameSwitch":${realNameSwitch},"applyStartTime":"${realNameSwitch}","chargeType":0,"vipActivityId":"${vipActivityId}","goodsName":"${goodsName}","name":"${goodsName}","activityType":${activityType},"applyEndTime":"${applyEndTime}","beginTime":"${beginTime}","endTime":"${endTime}","detailedAddress":"报名后拉群发详细地址","imgList":[{"url":"https://dating-agency-test.oss-accelerate.aliyuncs.com/cloudprint_b9daff2e-eb00-47c7-b4d0-3067c66247e9.png"}],"depict":"${DateTime}测试活动","provinceCode":${provinceCode},"cityCode":${cityCode},"districtCode":${districtCode},"provinceName":"${provinceName}","cityName":"${cityName}","districtName":"${districtName}","mutualAssistanceLimit":0,"numberParticipants":${numberParticipants},"numberMan":${numberMan},"numberWoman":${numberWoman},"id":"","participationAllocations":${participationAllocations}} {"applyStartTime":"${applyStartTime}","name":"${DateTime}测试活动","activityType":${activityType},"applyEndTime":"${applyEndTime}","beginTime":"${beginTime}","endTime":"${endTime}","detailedAddress":"","communityId":"${communityId}","communityName":"${communityName}","imgList":[{"url":"https://dating-agency-test.oss-accelerate.aliyuncs.com/微信图片_20240412144009.png"}],"depict":"${DateTime}测试活动","contactPictureUrl":"${contactPictureUrl}","communityQrCodeUrl":"${communityQrCodeUrl}","mutualAssistanceLimit":0,"numberParticipants":${numberParticipants},"numberMan":${numberMan},"numberWoman":${numberWoman},"participationAllocations":${participationAllocations},"realNameSwitch":${realNameSwitch},"chargeType":0} #活动数据
${reps} POST On Session dating dating-agency-service/user/save/site/activity ${AvtivityData.encode('utf-8')}
${AvtivityId} Get From Dictionary ${reps.json()} data #活动id
Set Global Variable ${AvtivityId}
diff --git a/output/log.html b/output/log.html
index f4dbc93..8416731 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};