From 97a10e5cadc5713249fef4ed50f9d912f3422bc1 Mon Sep 17 00:00:00 2001 From: "bei.wu" <5306546@qq.com> Date: Thu, 17 Sep 2020 11:23:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/ajax/SyncDataController.java | 14 +++- .../com/ruoyi/business/domain/BizMember.java | 14 +++- .../ruoyi/business/sync/UserDataListener.java | 71 +++++++++++++++++-- 3 files changed, 90 insertions(+), 9 deletions(-) diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/ajax/SyncDataController.java b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/SyncDataController.java index a852a5541..90c38d159 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/ajax/SyncDataController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/SyncDataController.java @@ -2,6 +2,9 @@ package com.ruoyi.business.ajax; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; +import com.ruoyi.business.domain.BizAccount; +import com.ruoyi.business.mapper.BizAccountMapper; +import com.ruoyi.business.mapper.BizMemberMapper; import com.ruoyi.business.service.IBizMemberService; import com.ruoyi.business.sync.UserData; import com.ruoyi.business.sync.UserDataListener; @@ -21,13 +24,15 @@ import java.io.IOException; public class SyncDataController extends BaseController { @Resource - private IBizMemberService bizMemberService; + private BizMemberMapper memberMapper; + @Resource + private BizAccountMapper accountMapper; @PostMapping("/user") public AjaxResult user(@RequestParam("file") MultipartFile file) { ExcelReader reader = null; try { - reader = EasyExcel.read(file.getInputStream(), UserData.class, new UserDataListener(bizMemberService)).build(); + reader = EasyExcel.read(file.getInputStream(), UserData.class, new UserDataListener(memberMapper, accountMapper)).build(); reader.readAll(); } catch (IOException e) { e.printStackTrace(); @@ -37,4 +42,9 @@ public class SyncDataController extends BaseController { } return AjaxResult.success(); } + + @PostMapping("/initUserTree") + public AjaxResult initUserTree() { + return AjaxResult.success(); + } } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMember.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMember.java index 3ad612454..1fb8360eb 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMember.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMember.java @@ -33,6 +33,9 @@ public class BizMember extends BaseEntity @Excel(name = "推荐人ID") private Long recommendId; + /** 所有推荐人ID */ + private String recommendAllId; + /** 推荐人手机 */ private String recommendMobile; @@ -109,7 +112,15 @@ public class BizMember extends BaseEntity return recommendId; } - public void setRecommendMobile(String recommendMobile) + public String getRecommendAllId() { + return recommendAllId; + } + + public void setRecommendAllId(String recommendAllId) { + this.recommendAllId = recommendAllId; + } + + public void setRecommendMobile(String recommendMobile) { this.recommendMobile = recommendMobile; } @@ -195,6 +206,7 @@ public class BizMember extends BaseEntity .append("memberName", getMemberName()) .append("password", getPassword()) .append("recommendId", getRecommendId()) + .append("recommendAllId", getRecommendAllId()) .append("recommendMobile", getRecommendMobile()) .append("recommendName", getRecommendName()) .append("memberType", getMemberType()) diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/sync/UserDataListener.java b/ruoyi-business/src/main/java/com/ruoyi/business/sync/UserDataListener.java index b1d6882bb..b378a8a33 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/sync/UserDataListener.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/sync/UserDataListener.java @@ -2,16 +2,23 @@ package com.ruoyi.business.sync; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; +import com.ruoyi.business.domain.BizAccount; import com.ruoyi.business.domain.BizMember; -import com.ruoyi.business.service.IBizMemberService; +import com.ruoyi.business.mapper.BizAccountMapper; +import com.ruoyi.business.mapper.BizMemberMapper; import com.ruoyi.common.utils.DateUtils; +import java.math.BigDecimal; + public class UserDataListener extends AnalysisEventListener { - private IBizMemberService bizMemberService; + private BizMemberMapper memberMapper; - public UserDataListener(IBizMemberService bizMemberService) { - this.bizMemberService = bizMemberService; + private BizAccountMapper accountMapper; + + public UserDataListener(BizMemberMapper memberMapper, BizAccountMapper accountMapper) { + this.memberMapper = memberMapper; + this.accountMapper = accountMapper; } @Override @@ -20,12 +27,64 @@ public class UserDataListener extends AnalysisEventListener { member.setMemberName(userData.getName()); member.setPassword(userData.getPassword()); member.setIsDelete(0); - member.setIsEnable(Integer.parseInt(userData.getEnable())); + member.setIsEnable("Y".equals(userData.getEnable()) ? 1 : 0); member.setCreateTime(DateUtils.parseDate(userData.getAddtim())); + member.setUpdateTime(DateUtils.parseDate(userData.getAddtim())); member.setMobile(userData.getReferrerTelephone()); member.setRecommendMobile(userData.getReferrerTelephone()); member.setRecommendName(userData.getReferrer()); - System.out.println(userData); + member.setId(Long.valueOf(userData.getId())); + memberMapper.insertBizMember(member); + + // 创建专项福豆账户 + BizAccount account = new BizAccount(); + account.setMemberId(member.getId()); + account.setAccountType(3); + account.setAmount(new BigDecimal(userData.getTourismPorints())); + account.setCreateBy("admin"); + account.setCreateTime(member.getCreateTime()); + account.setUpdateTime(member.getUpdateTime()); + accountMapper.insertBizAccount(account); + + // 创建福豆余额账户 + BizAccount account1 = new BizAccount(); + account1.setMemberId(member.getId()); + account1.setAccountType(0); + account1.setAmount(new BigDecimal(userData.getPorintsSurplus())); + account1.setCreateBy("admin"); + account1.setCreateTime(member.getCreateTime()); + account1.setUpdateTime(member.getUpdateTime()); + accountMapper.insertBizAccount(account1); + + // 创建个人（可用）福豆账户 + BizAccount account2 = new BizAccount(); + account2.setMemberId(member.getId()); + account2.setAccountType(1); + account2.setAmount(new BigDecimal(userData.getPecialItemPorints())); + account2.setCreateBy("admin"); + account2.setCreateTime(member.getCreateTime()); + account2.setUpdateTime(member.getUpdateTime()); + accountMapper.insertBizAccount(account2); + + // 创建团队福豆账户 + BizAccount account3 = new BizAccount(); + account3.setMemberId(member.getId()); + account3.setAccountType(2); + account3.setAmount(new BigDecimal(userData.getTreamPorints())); + account3.setCreateBy("admin"); + account3.setCreateTime(member.getCreateTime()); + account3.setUpdateTime(member.getUpdateTime()); + accountMapper.insertBizAccount(account3); + + // 创建福豆田账户 + BizAccount account4 = new BizAccount(); + account4.setMemberId(member.getId()); + account4.setAccountType(4); + account4.setAmount(new BigDecimal(userData.getFieldsPorint())); + account4.setCreateBy("admin"); + account4.setCreateTime(member.getCreateTime()); + account4.setUpdateTime(member.getUpdateTime()); + accountMapper.insertBizAccount(account4); } @Override