|
@@ -2,6 +2,7 @@ package com.qs.mp.web.controller.api.admin;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.qs.mp.admin.domain.TicketPackage;
|
|
import com.qs.mp.admin.domain.TicketPackage;
|
|
import com.qs.mp.admin.domain.param.ChannelOrderPkgParam;
|
|
import com.qs.mp.admin.domain.param.ChannelOrderPkgParam;
|
|
import com.qs.mp.admin.domain.param.ChannelOrderQueryParam;
|
|
import com.qs.mp.admin.domain.param.ChannelOrderQueryParam;
|
|
@@ -175,6 +176,33 @@ public class ChannelOrderMgrController extends BaseApiController {
|
|
return AjaxResult.error("发货失败");
|
|
return AjaxResult.error("发货失败");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 订单发货单号修改
|
|
|
|
+ */
|
|
|
|
+ @Log(title = "经销商订单发货单号修改", businessType = BusinessType.UPDATE)
|
|
|
|
+ @PostMapping("/ship/update")
|
|
|
|
+ @ApiOperation(value = "订单发货单号修改" , notes = "在订单发货页面提交")
|
|
|
|
+ @PreAuthorize("@ss.hasPermi('order:channel:ship')")
|
|
|
|
+ public AjaxResult updateShipInfo(@RequestBody ChannelOrderShipParam shipParam) {
|
|
|
|
+ if(null == shipParam || StringUtils.isBlank(shipParam.getOrderId())
|
|
|
|
+ || null == shipParam.getDeliveryId() || StringUtils.isBlank(shipParam.getDeliveryFlowId())) {
|
|
|
|
+ return error(ErrorCodeEnum.ERROR_CODE_1001);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ChannelOrder order = channelOrderService.getById(shipParam.getOrderId());
|
|
|
|
+ if(null == order || StringUtils.isBlank(order.getOrderId())
|
|
|
|
+ || null == order.getChannelId()) {
|
|
|
|
+ return error(ErrorCodeEnum.ERROR_CODE_1001);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ boolean rtn = channelOrderService.update(new LambdaUpdateWrapper<ChannelOrder>()
|
|
|
|
+ .set(ChannelOrder::getDeliveryId, shipParam.getDeliveryId())
|
|
|
|
+ .set(ChannelOrder::getDeliveryFlowId, shipParam.getDeliveryFlowId())
|
|
|
|
+ .eq(ChannelOrder::getOrderId, shipParam.getOrderId()));
|
|
|
|
+ return rtn ? AjaxResult.success() : AjaxResult.error("修改失败");
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
@PostMapping("/item/list")
|
|
@PostMapping("/item/list")
|
|
@ApiOperation(value = "获取经销商订单盲票组列表", notes = "")
|
|
@ApiOperation(value = "获取经销商订单盲票组列表", notes = "")
|
|
public AjaxResult list(@RequestBody ChannelOrder order) {
|
|
public AjaxResult list(@RequestBody ChannelOrder order) {
|