From 91c2da533b0c45799f660d46c870df9a103b6696 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 8 Nov 2022 14:44:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BF=94=E5=88=A9=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jmfy/model/gm/ARBMission.java | 9 ++++++- .../resources/templates/addARBMission.html | 2 +- src/main/resources/templates/itemFlow.html | 24 ++----------------- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/jmfy/model/gm/ARBMission.java b/src/main/java/com/jmfy/model/gm/ARBMission.java index 49d90f0..1649570 100644 --- a/src/main/java/com/jmfy/model/gm/ARBMission.java +++ b/src/main/java/com/jmfy/model/gm/ARBMission.java @@ -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) { diff --git a/src/main/resources/templates/addARBMission.html b/src/main/resources/templates/addARBMission.html index 5cc49fe..6a9ddbe 100644 --- a/src/main/resources/templates/addARBMission.html +++ b/src/main/resources/templates/addARBMission.html @@ -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; diff --git a/src/main/resources/templates/itemFlow.html b/src/main/resources/templates/itemFlow.html index c8521af..60c4b8c 100644 --- a/src/main/resources/templates/itemFlow.html +++ b/src/main/resources/templates/itemFlow.html @@ -37,13 +37,12 @@ - - + - + @@ -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'},`; }