master
gaojie 2019-05-20 19:31:49 +08:00
parent b6a9a7de86
commit 47e1c11dc7
1 changed files with 39 additions and 27 deletions

View File

@ -8,6 +8,7 @@ import com.jmfy.model.vo.ItemFlowVo;
import com.jmfy.model.vo.ShopItemInfoVo;
import com.jmfy.utils.JsonUtil;
import com.jmfy.utils.STableManager;
import groovy.util.IFileNameFinder;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
@ -42,7 +43,7 @@ public class FindFlowController {
itemFlowVo.setUserId(moneyFlow.getUid());
itemFlowVo.setServerId(moneyFlow.getServerId());
itemFlowVo.setTime(moneyFlow.getTime());
itemFlowVo.setItemName(getItemName(Integer.parseInt(moneyFlow.getiMoneyType())));
itemFlowVo.setItemName(getItemName(Integer.parseInt(moneyFlow.getiMoneyType()),999));
itemFlowVo.setReason(getReason(moneyFlow.getReason()));
itemFlowVo.setUserLevel(moneyFlow.getLevel());
itemFlowVo.setAfterMoney(moneyFlow.getAfterMoney());
@ -57,7 +58,7 @@ public class FindFlowController {
itemFlowVo.setServerId(itemFlow.getServerId());
itemFlowVo.setTime(itemFlow.getTime());
itemFlowVo.setUserLevel(itemFlow.getLevel());
itemFlowVo.setItemName(getItemName(Integer.parseInt(itemFlow.getiGoodsId())));
itemFlowVo.setItemName(getItemName(Integer.parseInt(itemFlow.getiGoodsId()),Integer.parseInt(itemFlow.getiGoodsType())));
itemFlowVo.setReason(getReason(itemFlow.getReason()));
itemFlowVo.setAfterMoney(itemFlow.getAfterCount());
itemFlowVo.setAddOrReduce(itemFlow.getAddOrReduce());
@ -72,32 +73,43 @@ public class FindFlowController {
return STableManager.getInstance().getsReason(Integer.parseInt(reason));
}
private String getItemName(int itemId) {
String itemName = getMoneyName(itemId);
if (!itemName.isEmpty()){
return itemName;
private String getItemName(int itemId, int iGoodsType) {
String itemName;
switch (iGoodsType) {
case 999:
itemName = getMoneyName(itemId);
break;
case 0:
itemName = STableManager.getInstance().getsItemName(itemId);
break;
case 2:
itemName = STableManager.getInstance().getsHeroName(itemId);
break;
case 3:
itemName = STableManager.getInstance().getsYaofuName(itemId);
break;
case 5:
itemName = STableManager.getInstance().getsYaofuName(itemId);
break;
case 6:
itemName = STableManager.getInstance().getsItemName(itemId);
break;
case 7:
itemName = STableManager.getInstance().getsItemName(itemId);
break;
case 8:
itemName = STableManager.getInstance().getsItemName(itemId);
break;
case 10:
itemName = STableManager.getInstance().getsMindName(itemId);
break;
default:
itemName = STableManager.getInstance().getsExpCardName(itemId);
if (itemName.isEmpty()) {
itemName = String.valueOf(itemId);
}
}
itemName =STableManager.getInstance().getsItemName(itemId);
if (itemName != null){
return itemName;
}
itemName =STableManager.getInstance().getsExpCardName(itemId);
if (itemName != null){
return itemName;
}
itemName =STableManager.getInstance().getsMindName(itemId);
if (itemName != null){
return itemName;
}
itemName =STableManager.getInstance().getsHeroName(itemId);
if (itemName != null){
return itemName;
}
itemName =STableManager.getInstance().getsYaofuName(itemId);
if (itemName != null){
return itemName;
}
return String.valueOf(itemId);
return itemName;
}
private String getMoneyName(int moneyType) {