From 457e219b261a12387e423d331f4ec4841b7ac32d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 26 Aug 2021 11:58:09 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java
index 2948fdc..2d46c1c 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java
@@ -40,6 +40,7 @@
 import com.xzx.gc.model.user.*;
 import com.xzx.gc.order.dto.*;
 import com.xzx.gc.order.mapper.*;
+import com.xzx.gc.order.vo.InviteUserOrderVo;
 import com.xzx.gc.service.AccountContext;
 import com.xzx.gc.util.DoubleUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -226,7 +227,11 @@
 
     @Autowired
     private OrderHomeApplianceService orderHomeApplianceService;
+    @Autowired
+    private DistribService distribService;
 
+    @Autowired
+    private JhyOrderMapper jhyOrderMapper;
 
 
     public OrderReserveResDto getReserveTimeNew(OrderReserveResDto orderReserveResDto, String partnerId) {
@@ -1150,6 +1155,7 @@
                         traceIds = getTrace(orderInfoReq);
                     }
 
+                    distribService.inviteAddOrderScore(orderInfoReq.getCreateUserId(), orderId);
                 }
             }
         } catch (RestException e) {
@@ -3291,6 +3297,8 @@
 
                 //更新账户余额
                 accountService.updateMoneyByUserId(receiver, Convert.toBigDecimal(payMoney.toString()));
+
+                distribService.inviteAddOrderScore(createUserId, orderId);
                 return Result.success(byUserId.getAccountName());
             } catch (Exception e) {
                 ExceptionUtils.err("支付失败", e);
@@ -3791,4 +3799,21 @@
         }
         orderDetailService.updateAllById(orderDetailInfo);
     }
+
+    public PageInfo<InviteUserOrderVo> inviteUserOrderDetail(InviteUserOrderDetailsDto detailsDto) {
+        UserInfo userInfo = userMapper.selectByPrimaryKey(detailsDto.getUserId());
+        if (userInfo == null) {
+            throw new RestException("用户不存在");
+        }
+
+        detailsDto.setPhone(userInfo.getMobilePhone());
+        List<InviteUserOrderVo> orderVos = new ArrayList<>();
+        PageHelper.startPage(detailsDto.getPage(), detailsDto.getLimit());
+        if (detailsDto.getType() == 1) {
+            orderVos = orderMapper.selectInviteUserOrderList(detailsDto);
+        } else {
+            orderVos = jhyOrderMapper.selectInviteUserOrderList(detailsDto);
+        }
+        return new PageInfo<>(orderVos);
+    }
 }

--
Gitblit v1.9.1