java/qijisheng.git

			@@ -30,6 +30,7 @@
			import com.ruoyi.order.util.payment.model.RefundCallbackResult;
			import com.ruoyi.order.util.payment.model.RefundResult;
			import com.ruoyi.order.util.vo.MapTrackKD100Vo;
			import com.ruoyi.order.util.vo.QueryKD100ListVo;
			import com.ruoyi.order.util.vo.QueryKD100Vo;
			import com.ruoyi.order.vo.*;
			import com.ruoyi.other.api.domain.*;
			@@ -201,6 +202,12 @@
			orderDetailVO.setLongitude(shop.getLongitude());
			orderDetailVO.setLatitude(shop.getLatitude());
			orderDetailVO.setShopId(shop.getId());
			if(StringUtils.isNotEmpty(order.getExpressResult())){
			MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(order.getExpressResult(), MapTrackKD100Vo.class);
			List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
			orderDetailVO.setExpress(data.size() > 0 ? data.get(0).getContext() : "");
			}

			if(order.getOrderType() == 1){
			List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
			if(data.size() > 0){
			@@ -256,7 +263,7 @@
			Order order = orderMapper.selectById(id);
			boolean check = check(order, shopId, loginUserApplet.getUserid());
			if (!check){
			throw new ServiceException("订单不存在");
			throw new ServiceException("该订单与当前扫码门店不一致");
			}

			// 售后设置
			@@ -330,8 +337,7 @@
			orderPageListVo.setUserName(appUser.getName());
			orderPageListVo.setPhone(appUser.getPhone());
			}
			// RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
			RefundPass one = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderPageListVo.getId()).one();
			RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
			orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null);

			// 平台分佣