java/qijisheng.git

			@@ -16,8 +16,10 @@
			import com.ruoyi.order.enums.OrderStatus;
			import com.ruoyi.order.mapper.OrderMapper;
			import com.ruoyi.order.model.Order;
			import com.ruoyi.order.model.RefundPass;
			import com.ruoyi.order.service.CommissionService;
			import com.ruoyi.order.service.OrderService;
			import com.ruoyi.order.service.RefundPassService;
			import com.ruoyi.order.util.payment.model.RefundCallbackResult;
			import com.ruoyi.order.util.vo.MapTrackKD100Vo;
			import com.ruoyi.order.vo.*;
			@@ -69,6 +71,8 @@
			private OrderMapper orderMapper;
			@Resource
			private SysUserClient sysUserClient;
			@Resource
			private RefundPassService refundPassService;


			/**
			@@ -127,9 +131,9 @@
			@ApiImplicitParams({
			@ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
			})
			@GetMapping("/writeOff/{id}/{shopId}")
			public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId){
			orderService.writeOff(id, shopId);
			@GetMapping("/writeOff/{id}/{shopId}/{technicianId}")
			public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId, @PathVariable("technicianId") Integer technicianId){
			orderService.writeOff(id, shopId, technicianId);
			return R.ok();
			}

			@@ -246,7 +250,7 @@
			@PostMapping("/confirmDelivery")
			@ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
			public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
			return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
			return orderService.confirmDelivery(confirmDelivery);
			}


			@@ -267,6 +271,10 @@
			@ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
			public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
			OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
			RefundPass refundPass = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderId).one();
			if (refundPass!=null){
			orderInfo.setRefundPassId(refundPass.getId().toString());
			}
			return R.ok(orderInfo);
			}