From ebd6a507b8b39ea110814fee706d142712f2512c Mon Sep 17 00:00:00 2001 From: "bei.wu" <5306546@qq.com> Date: Wed, 23 Sep 2020 15:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/ajax/SyncDataController.java | 40 ++++++++++++++++++- .../business/mapper/BizMemberMapper.java | 6 +++ .../business/mapper/BizProductMapper.java | 8 ++++ .../com/ruoyi/business/sync/OrderData.java | 20 +++++----- .../business/sync/OrderDataListener.java | 29 +++++++++++--- .../mapper/business/BizMemberMapper.xml | 15 +++++-- .../mapper/business/BizProductMapper.xml | 7 +++- 7 files changed, 105 insertions(+), 20 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 660bb23e9..6ed28f0bc 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 @@ -3,6 +3,7 @@ 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.domain.BizMember; import com.ruoyi.business.mapper.*; import com.ruoyi.business.service.IBizMemberService; import com.ruoyi.business.sync.*; @@ -16,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.IOException; +import java.util.List; @RestController @RequestMapping("/ajax/data") @@ -83,7 +85,7 @@ public class SyncDataController extends BaseController { public AjaxResult order(@RequestParam("file") MultipartFile file) { ExcelReader reader = null; try { - reader = EasyExcel.read(file.getInputStream(), OrderData.class, new OrderDataListener(orderMapper, memberMapper)).build(); + reader = EasyExcel.read(file.getInputStream(), OrderData.class, new OrderDataListener(orderMapper, memberMapper, productMapper)).build(); reader.readAll(); } catch (IOException e) { e.printStackTrace(); @@ -96,6 +98,42 @@ public class SyncDataController extends BaseController { @PostMapping("/initUserTree") public AjaxResult initUserTree() { + List memberList = memberMapper.selectBizMemberAll(); + BizMember member = memberMapper.selectBizMemberByMobile("13971055153"); + getChild(member, memberList); return AjaxResult.success(); } + + private void getChild(BizMember member, List memberList) { + for (BizMember m : memberList) { + if (member.getMobile().equals(m.getRecommendMobile())) { + m.setRecommendId(member.getId()); + memberMapper.updateBizMember(m); + getChild(m, memberList); + } + } + } + + @PostMapping("/initRecommendIds") + public AjaxResult initRecommendIds() { + List memberList = memberMapper.selectBizMemberAll(); + for (BizMember member : memberList) { + String id = getChildIds(member, memberList, new StringBuffer()); + member.setRecommendAllId(id.substring(0, id.length())); + memberMapper.updateBizMember(member); + } + + return AjaxResult.success(); + } + + private String getChildIds(BizMember member, List memberList, StringBuffer sb) { + for (BizMember m : memberList) { + if (member.getRecommendId().equals(m.getId())) { + String id = m.getId() + ","; + sb.insert(0, id); + getChildIds(m, memberList, sb); + } + } + return sb.toString(); + } } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizMemberMapper.java b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizMemberMapper.java index 39b7144c5..fb5f3245b 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizMemberMapper.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizMemberMapper.java @@ -45,6 +45,12 @@ public interface BizMemberMapper */ public List selectBizMemberList(BizMember bizMember); + /** + * 查询所有会员 + * @return 会员集合 + */ + public List selectBizMemberAll(); + /** * 会员福豆余额 * diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizProductMapper.java b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizProductMapper.java index f8a24a671..627d11785 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizProductMapper.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizProductMapper.java @@ -20,6 +20,14 @@ public interface BizProductMapper */ public BizProduct selectBizProductById(Long productId); + /** + * 查询产品 + * + * @param productCode 产品编码 + * @return 产品 + */ + public BizProduct selectBizProductByCode(String productCode); + /** * 查询产品图片列表 * diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/sync/OrderData.java b/ruoyi-business/src/main/java/com/ruoyi/business/sync/OrderData.java index 8401c13a7..482234c4d 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/sync/OrderData.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/sync/OrderData.java @@ -17,8 +17,8 @@ public class OrderData { private String orderRemark; private String addtime; private String detailsAddress; - private String addID; - private String mobile; + private String addId; + private String userTelephone; public String getId() { return id; @@ -140,19 +140,19 @@ public class OrderData { this.detailsAddress = detailsAddress; } - public String getAddID() { - return addID; + public String getAddId() { + return addId; } - public void setAddID(String addID) { - this.addID = addID; + public void setAddId(String addId) { + this.addId = addId; } - public String getMobile() { - return mobile; + public String getUserTelephone() { + return userTelephone; } - public void setMobile(String mobile) { - this.mobile = mobile; + public void setUserTelephone(String userTelephone) { + this.userTelephone = userTelephone; } } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/sync/OrderDataListener.java b/ruoyi-business/src/main/java/com/ruoyi/business/sync/OrderDataListener.java index d0fc81267..9a0441db6 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/sync/OrderDataListener.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/sync/OrderDataListener.java @@ -22,9 +22,12 @@ public class OrderDataListener extends AnalysisEventListener { private BizMemberMapper memberMapper; - public OrderDataListener(BizOrderMapper orderMapper, BizMemberMapper memberMapper) { + private BizProductMapper productMapper; + + public OrderDataListener(BizOrderMapper orderMapper, BizMemberMapper memberMapper, BizProductMapper productMapper) { this.orderMapper = orderMapper; this.memberMapper = memberMapper; + this.productMapper = productMapper; } @Override @@ -32,12 +35,21 @@ public class OrderDataListener extends AnalysisEventListener { BizOrder order = new BizOrder(); order.setId(Long.valueOf(orderData.getId())); order.setOrderSn(orderData.getOrderNumber()); - order.setMobile(orderData.getMobile()); + order.setMobile(orderData.getUserTelephone()); order.setOrderAmount(new BigDecimal(orderData.getPayCount())); - order.setOrderStatus(Integer.parseInt(orderData.getOrderStatus())); + + int status; + if ("2".equals(orderData.getOrderStatus())) { + status = 3; + } else if ("3".equals(orderData.getOrderStatus())) { + status = 4; + } else { + status = Integer.parseInt(orderData.getOrderStatus()); + } + order.setOrderStatus(status); order.setCreateBy("admin"); order.setCreateTime(DateUtils.parseDate(orderData.getAddtime())); - order.setAddressId(StringUtils.isBlank(orderData.getAddID()) ? 0L : Long.parseLong(orderData.getAddID())); + order.setAddressId(StringUtils.isBlank(orderData.getAddId()) ? 0L : Long.parseLong(orderData.getAddId())); order.setAddressDetail(orderData.getDetailsAddress()); order.setRemark(orderData.getOrderRemark()); @@ -59,7 +71,14 @@ public class OrderDataListener extends AnalysisEventListener { orderDetail.setProductCount(Integer.parseInt(orderData.getBuyGoodsNums())); orderDetail.setCreateBy("admin"); orderDetail.setCreateTime(order.getCreateTime()); - orderDetail.setProductId(0L); + + BizProduct product = productMapper.selectBizProductByCode(orderData.getGoodsId()); + if (Objects.isNull(product)) { + orderDetail.setProductId(0L); + } else { + orderDetail.setProductId(product.getId()); + } + orderMapper.insertBizOrderDetail(orderDetail); } diff --git a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml index 2db7e00f5..fbe3bf1bd 100644 --- a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml @@ -31,6 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from biz_member a + + select id, mobile, member_name, password, recommend_id, recommend_mobile, recommend_name, member_type, is_delete, is_enable, create_by, create_time, update_by, update_time + from biz_member a + + + + - select amount from biz_account where member_id = #{memberID} and account_type = #{type} @@ -127,12 +136,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select count(id) from biz_member a where recommend_id = #{memberID} and exists(select id from biz_order b where b.member_id = a.id and is_team = 1) - select a.id,a.mobile,a.member_name,a.recommend_id, sum(IF(c.product_count IS NULL,0,c.product_count)) as num from biz_member a left join biz_order b on a.id = b.member_id and b.order_status > 0 and b.is_team = 1 left join biz_order_detail c on c.order_id = b.id diff --git a/ruoyi-business/src/main/resources/mapper/business/BizProductMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizProductMapper.xml index 5ef02035a..c73642b61 100644 --- a/ruoyi-business/src/main/resources/mapper/business/BizProductMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/business/BizProductMapper.xml @@ -53,13 +53,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{productId} + + - + insert into biz_product