Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-08-25 461a737f9b4c935213698feddc12b535a588b832

 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);
    }
}