diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index 5e06aa7..f7bd761 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,2 +1,2 @@
手机号
-15014242835
\ No newline at end of file
+13168550964
\ No newline at end of file
diff --git a/1-Applet/6-Activity/ActivityResource.robot b/1-Applet/6-Activity/ActivityResource.robot
index eff97f7..13e380f 100644
--- a/1-Applet/6-Activity/ActivityResource.robot
+++ b/1-Applet/6-Activity/ActivityResource.robot
@@ -9,23 +9,27 @@ Library DatabaseLibrary
*** Keywords ***
查询${dating}用户资料
${miId_list} Create List
+ ${nickNameList} Create List
${genderCodeList} Create List
FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId}
${miId} Get From Dictionary ${reps.json()['data']} id #资料id
+ ${nickName} Get From Dictionary ${reps.json()['data']} nickName #用户昵称
${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #男0，女1
Append To List ${miId_list} ${miId}
+ Append To List ${nickNameList} ${nickName}
Append To List ${genderCodeList} ${genderCode}
Set Global Variable ${userId}
Set Global Variable ${miId_list}
+ Set Global Variable ${nickNameList}
Set Global Variable ${genderCodeList}
END
查询${dating}活动列表
FOR ${genderCode} ${client-header} IN ZIP ${genderCodeList} ${Cheader_list}
Create Session dating ${${dating}.dating域名} ${client-header}
- ${reps} GET On Session dating dating-agency-service/user/get/site/activity/page params=queryType=0&pageNum=1&pageSize=10&status=
+ ${reps} GET On Session dating dating-agency-service/user/get/site/activity/page params=queryType=0&pageNum=1&pageSize=100&matchmakerFlag=${matchmakerFlag}&status=&pageSize=10&status=
${records} Get From Dictionary ${reps.json()['data']} records #近期活动列表
Set Global Variable ${records}
Set Global Variable ${genderCode}
@@ -47,18 +51,41 @@ Library DatabaseLibrary
${Number2} Set Variable If ${genderCode}==0 ${manNumber} ${womanNumber} #当用户性别为男，输出男士已参与人数，否则输出女生已参与人数
${totalNum} Evaluate ${manNumber}+${womanNumber} #总参与人数
${registrationPopulation} Get From Dictionary ${records} registrationPopulation #已报名总数
- Exit For Loop If ${status}==1 and ${Number1}!=${Number2} #活动状态，1报名中，2待开始，3进行中，4已取消，5已结束
- #Set Global Variable ${AvtivityId}
+ Run Keyword If ${status}!=1 Continue For Loop #跳过此次循环
+ ... ELSE Exit For Loop If ${status}==1 and ${Number1}!=${Number2} #活动状态，1报名中，2待开始，3进行中，4已取消，5已结束
END
Set Global Variable ${AvtivityId}
+查询${dating}活动已报名列表数据
+ #查询活动已报名列表数据
+ FOR ${admin_header} IN @{Aheader_list}
+ Create Session dating ${${dating}.dating域名} ${admin_header}
+ ${reps} GET On Session dating dating-agency-service/user/get/web/site/activity/participant/list params=id=${AvtivityId}
+ ${participantListList} Get From Dictionary ${reps.json()['data']} participantListList #活动已报名列表
+ Set Global Variable ${participantListList}
+ Run Keyword If ${participantListList}==[] log 暂无用户报名
+ END
+
+遍历活动已报名列表
+ FOR ${phone} ${nickName} ${participantData} IN ZIP ${phoneList} ${nickNameList} ${participantListList}
+ Set Global Variable ${nickName}
+ ${sapId} Get From Dictionary ${participantData} sapId #参与活动id
+ ${Userphone} Get From Dictionary ${participantData} phone #参与用户手机号
+ ${UsernickName} Get From Dictionary ${participantData} nickName #参与用户昵称
+ Run Keyword If ${Userphone}==${phone} Continue For Loop #如果手机号相等跳出此次循环
+ Run Keyword If ${Userphone}==${phone} log 该用户已报名
+ ... ELSE 数据库新增活动参与人
+ END
+
用户报名${dating}活动
#用户报名活动
FOR ${client_header} IN @{Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
${data} Set Variable {"id":"${AvtivityId}"}
${reps} POST On Session dating dating-agency-service/user/participate/in/site/activity ${data.encode('utf-8')}
- 数据库新增活动参与人
+ 查询婚介活动已报名列表数据
+ Run Keyword If ${participantListList}==[] 数据库新增活动参与人
+ ... ELSE 遍历活动已报名列表
END
数据库新增活动参与人
diff --git a/2-Web/SiteActivity/SiteActivityResources.robot b/2-Web/SiteActivity/SiteActivityResources.robot
index 85dab70..b4e99d8 100644
--- a/2-Web/SiteActivity/SiteActivityResources.robot
+++ b/2-Web/SiteActivity/SiteActivityResources.robot
@@ -86,6 +86,29 @@ Library DatabaseLibrary
Set Global Variable ${activityId}
Set Global Variable ${activeState}
+创建${dating}平台活动
+ #创建活动
+ region
+ FOR ${admin_header} IN @{Aheader_list}
+ Create Session dating ${${dating}.dating域名} ${admin_header}
+ ${DateTime} Get Current Date result_format=%Y-%m-%d #获取当天日期
+ ${applyStartTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S #获取当前时间，报名开始时间
+ ${applyEndTime} Add Time To Date ${applyStartTime} 1 day #报名结束时间
+ ${applyEndTime} Get Substring ${applyEndTime} 0 19
+ ${beginTime} Add Time To Date ${applyStartTime} 2 days #活动开始时间
+ ${beginTime} Get Substring ${beginTime} 0 19
+ ${endTime} Add Time To Date ${applyStartTime} 5 days #活动结束时间
+ ${endTime} Get Substring ${endTime} 0 19
+ ${participationAllocations} Set Variable [{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":1,"genderCode":0,"userType":0,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":0,"userType":1,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":1,"userType":0,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.6,"genderCode":1,"userType":1,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0}] #用户参数配置
+ ${numberWoman} Evaluate random.randint(1,25) random #女士数随机获取~25间的正整数
+ ${numberMan} Evaluate random.randint(1,25) random #男士随机获取1~25间的正整数
+ ${numberParticipants} Evaluate ${numberWoman}+${numberMan} #总人数=女士人数+男士人数
+ ${AvtivityData} Set Variable {"applyStartTime":"${applyStartTime}","name":"${DateTime}测试活动","activityType":1,"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}","provinceCode":${provinceCode},"cityCode":${cityCode},"districtCode":${districtCode},"provinceName":"${provinceName}","cityName":"${districtName}","districtName":"${cityName}","mutualAssistanceLimit":0,"numberParticipants":${numberParticipants},"numberMan":${numberMan},"numberWoman":${numberWoman},"participationAllocations":${participationAllocations}} #活动数据
+ ${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}
+ END
+
region
#获取户口所在地
Disable Warnings
@@ -112,26 +135,3 @@ region
Set Global Variable ${districtName}
Set Global Variable ${provinceCode}
Set Global Variable ${provinceName}
-
-创建${dating}平台活动
- #创建活动
- region
- FOR ${admin_header} IN @{Aheader_list}
- Create Session dating ${${dating}.dating域名} ${admin_header}
- ${DateTime} Get Current Date result_format=%Y-%m-%d #获取当天日期
- ${applyStartTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S #获取当前时间，报名开始时间
- ${applyEndTime} Add Time To Date ${applyStartTime} 1 day #报名结束时间
- ${applyEndTime} Get Substring ${applyEndTime} 0 19
- ${beginTime} Add Time To Date ${applyStartTime} 2 days #活动开始时间
- ${beginTime} Get Substring ${beginTime} 0 19
- ${endTime} Add Time To Date ${applyStartTime} 5 days #活动结束时间
- ${endTime} Get Substring ${endTime} 0 19
- ${participationAllocations} Set Variable [{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":1,"genderCode":0,"userType":0,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":0,"userType":1,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":1,"userType":0,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.6,"genderCode":1,"userType":1,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0}] #用户参数配置
- ${numberWoman} Evaluate random.randint(1,25) random #女士数随机获取~25间的正整数
- ${numberMan} Evaluate random.randint(1,25) random #男士随机获取1~25间的正整数
- ${numberParticipants} Evaluate ${numberWoman}+${numberMan} #总人数=女士人数+男士人数
- ${AvtivityData} Set Variable {"applyStartTime":"${applyStartTime}","name":"${DateTime}测试活动","activityType":1,"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}","provinceCode":${provinceCode},"cityCode":${cityCode},"districtCode":${districtCode},"provinceName":"${provinceName}","cityName":"${districtName}","districtName":"${cityName}","mutualAssistanceLimit":0,"numberParticipants":${numberParticipants},"numberMan":${numberMan},"numberWoman":${numberWoman},"participationAllocations":${participationAllocations}} #活动数据
- ${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}
- END
diff --git a/output/log.html b/output/log.html
index 8e98886..ca4ebe0 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};