java/qijisheng.git

			@@ -1,5 +1,6 @@
			package com.ruoyi.order.service.impl;

			import cn.hutool.core.collection.CollectionUtil;
			import com.alibaba.fastjson2.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			@@ -14,18 +15,19 @@
			import com.ruoyi.order.enums.OrderType;
			import com.ruoyi.order.mapper.OrderGoodMapper;
			import com.ruoyi.order.mapper.OrderMapper;
			import com.ruoyi.order.model.Order;
			import com.ruoyi.order.model.OrderGood;
			import com.ruoyi.order.service.OrderService;
			import vo.OrderDetailVO;
			import vo.OrderGoodsVO;
			import com.ruoyi.order.vo.OrderDetailVO;
			import com.ruoyi.order.vo.OrderGoodsVO;
			import com.ruoyi.order.vo.OrderVO;
			import com.ruoyi.other.api.domain.CouponInfo;
			import com.ruoyi.other.api.domain.Goods;
			import com.ruoyi.other.api.domain.OrderActivityInfo;
			import com.ruoyi.other.api.domain.Technician;
			import com.ruoyi.other.api.feignClient.GoodsClient;
			import com.ruoyi.other.api.feignClient.TechnicianClient;
			import com.ruoyi.system.api.model.LoginUser;
			import model.Order;
			import model.OrderGood;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			@@ -54,6 +56,8 @@
			private TokenService tokenService;
			@Resource
			private TechnicianClient technicianClient;
			@Resource
			private GoodsClient goodsClient;


			@Override
			@@ -70,6 +74,7 @@
			if (order == null){
			throw new ServiceException("订单不存在");
			}

			// 商品
			List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>()
			.eq(OrderGood::getOrderId, orderId));
			@@ -89,6 +94,7 @@
			orderGoodsVO.setOriginalPrice(goods.getOriginalPrice());
			goodsList.add(orderGoodsVO);
			}



			// 收货地址
			@@ -114,7 +120,17 @@
			}

			OrderDetailVO orderDetailVO = new OrderDetailVO();

			if (CollectionUtil.isNotEmpty(orderGoods)){
			String goodJson = orderGoods.get(0).getGoodJson();
			Goods goods = JSONObject.parseObject(goodJson, Goods.class);
			orderDetailVO.setDistributionMode(goods.getDistributionMode());
			}



			orderDetailVO.setId(order.getId());
			orderDetailVO.setOrderStatus(order.getOrderStatus());
			orderDetailVO.setPoint(order.getPoint());
			orderDetailVO.setAddressId(userAddress.getId());
			orderDetailVO.setRecieveName(userAddress.getRecieveName());