java/qijisheng.git

			@@ -98,4 +98,7 @@
			@ApiModelProperty(value = "第三方快递结果")
			@TableField("express_result")
			private String expressResult;

			@ApiModelProperty("最新快递信息")
			private String express;
			}

			@@ -91,5 +91,8 @@

			@ApiModelProperty("核销码BASE64")
			private String writeOffCode;

			@ApiModelProperty("最新快递信息")
			private String express;

			}

			@@ -17,6 +17,7 @@
			import com.ruoyi.order.service.RefundPassService;
			import com.ruoyi.order.util.ExpressDeliveryUtil;
			import com.ruoyi.order.util.vo.MapTrackKD100Vo;
			import com.ruoyi.order.util.vo.QueryKD100ListVo;
			import com.ruoyi.order.vo.*;
			import com.ruoyi.other.api.domain.SystemConfig;
			import com.ruoyi.other.api.feignClient.SystemConfigClient;
			@@ -88,6 +89,11 @@
			}
			one.setIdStr(one.getId().toString());
			one.setAddressJson(order.getAddressJson());
			if(StringUtils.isNotEmpty(one.getExpressResult())){
			MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(one.getExpressResult(), MapTrackKD100Vo.class);
			List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
			one.setExpress(data.size() > 0 ? data.get(0).getContext() : "");
			}
			return R.ok(one);
			}

			@@ -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){

	ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史