diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot index a424927..67e1b28 100644 --- a/0-Login/Login-interface.robot +++ b/0-Login/Login-interface.robot @@ -137,19 +137,5 @@ Library ImageHorizonLibrary #${Id} Set Variable 998286299716784128 #${IdType} Evaluate type(${Id}) #${Id} Convert To String ${IdType} - #逻辑计算 - ${validTime} Evaluate random.randint(0,24) random #随机一位正数,优惠券有效期 - #${assistNumber} Evaluate random.randrange(0,8,2) random #助力人数 - ${originalPrice} Evaluate round(random.uniform(0.05,0.1),2) random #随机一位浮点数,原价 - ${Vip_originalPrice} Evaluate round(random.uniform(0.02,0.08),2) random #VIP原价 - ${discountAmount} Evaluate round(random.uniform(0,${originalPrice}),2) random #优惠金额 - ${discountAmount} Set Variable If ${validTime}==0 0 ${discountAmount} - ${Vip_discountAmount} Evaluate round(random.uniform(0,${Vip_originalPrice}),2) random #VIP优惠金额 - ${Vip_discountAmount} Set Variable If ${validTime}==0 0 ${Vip_discountAmount} - ${transactionPrice} Evaluate round(random.uniform(0,(${originalPrice}-${discountAmount})),2) random #最低成交价 - ${Vip_transactionPrice} Evaluate round(random.uniform(0,(${Vip_originalPrice}-${Vip_discountAmount})),2) #会员最低成交价 - ${assistNumber} Evaluate abs(round((${originalPrice}-${discountAmount}-${transactionPrice})*100,0)) #助力人数 - ${Vip_assistNumber} Evaluate abs(round((${Vip_originalPrice}-${Vip_discountAmount}-${Vip_transactionPrice})*100,0)) #VIP助力人数 - #${transactionPrice} Set Variable If ${assistNumber}==0 0 ${transactionPrice} - #${Vip_transactionPrice} Set Variable If ${assistNumber}==0 0 ${Vip_transactionPrice} - #${average} Evaluate (${originalPrice}-${discountAmount}-${transactionPrice})/${assistNumber} random #平均优惠 + #随机取数字 + ${activityType} Evaluate "".join(random.sample("01",1)) random,string diff --git a/2-Web/SiteActivity/SiteActivityResources.robot b/2-Web/SiteActivity/SiteActivityResources.robot index b7ec7ca..2e3a23c 100644 --- a/2-Web/SiteActivity/SiteActivityResources.robot +++ b/2-Web/SiteActivity/SiteActivityResources.robot @@ -118,7 +118,9 @@ Library DatabaseLibrary ${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}} #活动数据 + ${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}} #活动数据 ${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 8782878..f4dbc93 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};