From 5ec06c513fd1060c9a91c9205bb2f0b96ca2ee2a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 17:11:38 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index d6a1e7b..91fb9a4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -192,17 +192,10 @@
 
     @Override
     public AdminAgentLevelUpdateInfoVo getAgentLevelUpdateInfoById(long id) {
-        AdminAgentLevelUpdateInfoVo adminAgentLevelUpdateInfoVo = new AdminAgentLevelUpdateInfoVo();
         DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectById(id);
         String value = dataDictionaryCustom.getValue();
         //{"directIncome":36,"lastCnt":3,"orderCnt":500,"orderType":2,"teamIncome":6,"teamIncomeType":2}
-        JSONObject jsonObject = JSONObject.parseObject(value);
-        adminAgentLevelUpdateInfoVo.setDirectIncome(new BigDecimal((jsonObject.get("directIncome")==null?0:jsonObject.get("directIncome")).toString()));
-        adminAgentLevelUpdateInfoVo.setLastCnt(Integer.parseInt((jsonObject.get("lastCnt")==null?0:jsonObject.get("lastCnt")).toString()));
-        adminAgentLevelUpdateInfoVo.setOrderCnt(Integer.parseInt((jsonObject.get("orderCnt")==null?0:jsonObject.get("orderCnt")).toString()));
-        adminAgentLevelUpdateInfoVo.setOrderType(Integer.parseInt(jsonObject.get("orderType").toString()));
-        adminAgentLevelUpdateInfoVo.setTeamIncome(new BigDecimal((jsonObject.get("teamIncome")==null?0:jsonObject.get("teamIncome")).toString()));
-        adminAgentLevelUpdateInfoVo.setTeamIncomeType(Integer.parseInt(jsonObject.get("orderType").toString()));
+        AdminAgentLevelUpdateInfoVo adminAgentLevelUpdateInfoVo = JSONObject.parseObject(value, AdminAgentLevelUpdateInfoVo.class);
         adminAgentLevelUpdateInfoVo.setId(id);
         return adminAgentLevelUpdateInfoVo;
     }
@@ -210,15 +203,9 @@
     @Override
     public FebsResponse agentLevelUpdate(AgentLevelUpdateDto agentLevelUpdateDto) {
         DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectById(agentLevelUpdateDto.getId());
-        AgentLevelUpdateDto agentLevelUpdateDtoJson = new AgentLevelUpdateDto();
-        agentLevelUpdateDtoJson.setDirectIncome(agentLevelUpdateDto.getDirectIncome());
-        agentLevelUpdateDtoJson.setLastCnt(agentLevelUpdateDto.getLastCnt());
-        agentLevelUpdateDtoJson.setOrderCnt(agentLevelUpdateDto.getOrderCnt());
-        agentLevelUpdateDtoJson.setTeamIncome(agentLevelUpdateDto.getTeamIncome());
-        agentLevelUpdateDtoJson.setOrderType(agentLevelUpdateDto.getOrderType());
-        agentLevelUpdateDtoJson.setTeamIncomeType(agentLevelUpdateDto.getTeamIncomeType());
-        JSONObject jsonObject = (JSONObject)JSONObject.toJSON(agentLevelUpdateDtoJson);
-        dataDictionaryCustom.setValue(jsonObject.toString());
+
+        agentLevelUpdateDto.setId(null);
+        dataDictionaryCustom.setValue(JSONObject.toJSONString(agentLevelUpdateDto));
         dataDictionaryCustomMapper.updateById(dataDictionaryCustom);
         return new FebsResponse().success();
     }

--
Gitblit v1.9.1