退货加图片;
This commit is contained in:
+2
-2
@@ -1294,7 +1294,7 @@ public class ReservationStockOutOrderApplicationService {
|
|||||||
reservationStockOutOrderMapper.updateById(entity);
|
reservationStockOutOrderMapper.updateById(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void returnGoods(String invoiceNumber, String transportationNumber, String orderId) {
|
public void returnGoods(String invoiceNumber, String transportationNumber, String orderId,String pictureUrl) {
|
||||||
stockOutOrderDomainService.returnGoods(invoiceNumber, transportationNumber, orderId);
|
stockOutOrderDomainService.returnGoods(invoiceNumber, transportationNumber, orderId, pictureUrl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-1
@@ -730,7 +730,7 @@ public class ReservationStockOutOrderDomainService {
|
|||||||
return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDO);
|
return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDO);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void returnGoods(String invoiceNumber, String transportationNumber, String orderId) {
|
public void returnGoods(String invoiceNumber, String transportationNumber, String orderId,String pictureUrl) {
|
||||||
reservationStockInOrderMapper.updateByOrderId(orderId);
|
reservationStockInOrderMapper.updateByOrderId(orderId);
|
||||||
reservationStockInOrderMapper.updateByTransportationNumber(transportationNumber);
|
reservationStockInOrderMapper.updateByTransportationNumber(transportationNumber);
|
||||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||||
@@ -750,6 +750,7 @@ public class ReservationStockOutOrderDomainService {
|
|||||||
ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper<ReservationStockOutOrder>().lambda().eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber), false);
|
ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper<ReservationStockOutOrder>().lambda().eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber), false);
|
||||||
if (stockOutOrder != null) {
|
if (stockOutOrder != null) {
|
||||||
ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder();
|
ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder();
|
||||||
|
reservationStockInOrder.setPictureUrl(pictureUrl);
|
||||||
reservationStockInOrder.setOrganizationId(stockOutOrder.getOrganizationId());
|
reservationStockInOrder.setOrganizationId(stockOutOrder.getOrganizationId());
|
||||||
reservationStockInOrder.setOrganizationName(stockOutOrder.getOrganizationName());
|
reservationStockInOrder.setOrganizationName(stockOutOrder.getOrganizationName());
|
||||||
reservationStockInOrder.setTopOrganizationId(stockOutOrder.getTopOrganizationId());
|
reservationStockInOrder.setTopOrganizationId(stockOutOrder.getTopOrganizationId());
|
||||||
|
|||||||
+2
-2
@@ -202,11 +202,11 @@ public class ReservationStockOutOrderApi extends BaseController {
|
|||||||
|
|
||||||
@ApiOperation("退货")
|
@ApiOperation("退货")
|
||||||
@GetMapping("/returnGoods")
|
@GetMapping("/returnGoods")
|
||||||
public AjaxResult returnGoods(@RequestParam("invoiceNumber") String invoiceNumber, @RequestParam("transportationNumber") String transportationNumber, @RequestParam("orderId") String orderId) {
|
public AjaxResult returnGoods(@RequestParam("invoiceNumber") String invoiceNumber, @RequestParam("transportationNumber") String transportationNumber, @RequestParam("orderId") String orderId, @RequestParam("pictureUrl") String pictureUrl) {
|
||||||
if (invoiceNumber == null || invoiceNumber.trim().isEmpty()) {
|
if (invoiceNumber == null || invoiceNumber.trim().isEmpty()) {
|
||||||
return AjaxResult.error("发票编号不能为空");
|
return AjaxResult.error("发票编号不能为空");
|
||||||
}
|
}
|
||||||
stockOutOrderApplicationService.returnGoods(invoiceNumber, transportationNumber, orderId);
|
stockOutOrderApplicationService.returnGoods(invoiceNumber, transportationNumber, orderId, pictureUrl);
|
||||||
return AjaxResult.success();
|
return AjaxResult.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user