自动返利活动优化2

master
duhui 2022-11-08 14:44:24 +08:00
parent 0be924a3e3
commit 91c2da533b
3 changed files with 11 additions and 24 deletions

View File

@ -1,5 +1,6 @@
package com.jmfy.model.gm;
import com.jmfy.model.vo.ARBActivityTypeEnum;
import com.jmfy.utils.JsonUtil;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.DBRef;
@ -77,7 +78,13 @@ public class ARBMission {
}
public String getRewardDescription() {
return JsonUtil.showReward(reward);
String result;
if(activity.getType() == ARBActivityTypeEnum.MONSTER_CURRENCY_BACK.getType()){
result = beforeNum + "|" + afterNum + "|" + backRatio;
}else {
result = JsonUtil.showReward(reward);
}
return result;
}
public void setReward(int[][] reward) {

View File

@ -246,7 +246,7 @@
afterNum = iframe.contentWindow.document.getElementById('afterNum').value;
backRatio = iframe.contentWindow.document.getElementById('backRatio').value;
let bool = afterNum >= 0 && beforeNum > 0 && backRatio > 0 && afterNum >= beforeNum;
let bool = afterNum >= 0 && beforeNum > 0 && backRatio > 0 && Number(afterNum) >= Number(beforeNum);
if (!bool) {
layer.msg('数值区间和返利数值配置错误!', {icon: 6, time: 1000});
return false;

View File

@ -37,13 +37,12 @@
<option value="0" selected="selected">0.所有</option>
<option th:each="item:${itemNameMap}" th:value="${item.key}" th:text="${item.key}+.+${item.value}"></option>
</select>
<span class="btn-upload form-group">
</span> <span class="select-box" style="width:150px">
<span class="select-box" style="width:150px">
<select class="select" id="type" size="1">
<option value="0" selected>获得</option>
<option value="1">消耗</option>
</select>
</span>
</span>
<button onclick="return onSearch();" class="btn btn-success radius" id="" name=""><i class="Hui-iconfont">&#xe665;</i>
查询
</button>
@ -114,31 +113,12 @@
}).get().join(",") + "}";
}
}).get().join(",");
// var aa =JSON.stringify(json); //将JSON对象转化为JSON字符
// alert(aa);
// var obj = JSON.parse(cc); //由JSON字符串转换为JSON对象
// alert(obj);
// const jsonData = JSON.stringify(json.responseObject);
var jsonData = eval("[" + json + "]");
var aa = JSON.stringify(jsonData);
var jsonData = JSON.parse(aa);//转换为json对象
// var jsonData = JSON.stringify(aa);
// alert(jsonData);
// var jsonData =JSON.parse(bb);
// alert(jsonData);
// alert(jsonData)
// var jsonData = [{用户id:'30006627',服务器ID:'10212',时间:'2019-04-11 00:02:51',用户等级:'100',道具名称:'0',道具数量:'0',动作后的物品存量:'4',物品操作原因:'213',增加:'0'}]
// alert(jsonData);
// var bb =JSON.stringify(jsonData); //将JSON对象转化为JSON字符
// alert(bb);
// alert(json);
let str = "用户id,服务器ID,时间,用户等级,道具名称,道具数量,动作后的物品存量,物品操作原因,增加:0/减少:1\n";
for (let i = 0; i < jsonData.length; i++) {
var parse = jsonData[i];
// var bb =JSON.stringify(jsonData[i])
// alert(bb);
// var parse = JSON.parse(bb);
// alert(parse);
for (let item in parse) {
str += `${parse[item] + '\t'},`;
}