...
|
...
|
@@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils; |
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
...
|
...
|
@@ -78,6 +77,9 @@ public class BuyerOrderController { |
|
|
@RequestMapping(value = "/batchConfirmReceive")
|
|
|
public ApiResponse batchConfirmReceive(BuyerOrderReq req) {
|
|
|
LOGGER.info("batchConfirmReceive in. req is {}", req);
|
|
|
if(StringUtils.isEmpty(req.getSellerWaybillCode())){
|
|
|
return new ApiResponse.ApiResponseBuilder().code(400).message("卖家快递单号不能为空").build();
|
|
|
}
|
|
|
buyerOrderService.batchConfirmReceive(req);
|
|
|
return new ApiResponse.ApiResponseBuilder().code(200).message("确认收货成功").build();
|
|
|
}
|
...
|
...
|
@@ -347,7 +349,7 @@ public class BuyerOrderController { |
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/queryByOrderCodeOrWaybillCode")
|
|
|
public ApiResponse queryByOrderCodeOrWaybillCode(@RequestBody BuyerOrderReq req) {
|
|
|
public ApiResponse queryByOrderCodeOrWaybillCode(BuyerOrderReq req) {
|
|
|
LOGGER.info("queryByOrderCodeOrWaybillCode in. queryStr is {}", req.getQueryStr());
|
|
|
PageResponseBO<BuyerOrderResp> result = buyerOrderService.queryByOrderCodeOrWaybillCode(req.getQueryStr());
|
|
|
return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(result).build();
|
...
|
...
|
@@ -430,6 +432,9 @@ public class BuyerOrderController { |
|
|
@RequestMapping(value = "/queryByWaybillCode4Qc")
|
|
|
public ApiResponse queryByWaybillCode4Qc(BuyerOrderReq req) {
|
|
|
LOGGER.info("queryByWaybillCode4Qc in. queryStr is {}", req.getSellerWaybillCode());
|
|
|
if(StringUtils.isEmpty(req.getSellerWaybillCode())){
|
|
|
return new ApiResponse.ApiResponseBuilder().code(400).message("卖家快递单号不能为空").build();
|
|
|
}
|
|
|
JSONObject result = buyerOrderService.queryOrderBySellerWaybillCodeForQc(req.getSellerWaybillCode());
|
|
|
return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(result).build();
|
|
|
}
|
...
|
...
|
|