Authored by caoyan

Merge branch 'dev_确认收货优化' into test6.9.7

... ... @@ -518,10 +518,10 @@ public class BuyerOrderController {
@RequestMapping(value = "/addAbnormalPackage")
public ApiResponse addAbnormalPackage(BuyerOrderReq req) {
LOGGER.info("addAbnormalPackage in. req is {}", req);
if(StringUtils.isEmpty(req.getSellerWaybillCode())) {
return new ApiResponse.ApiResponseBuilder().code(500).message("卖家快递单号不能为空").build();
if(StringUtils.isEmpty(req.getSellerWaybillCode()) || StringUtils.isEmpty(req.getPhoneUid())) {
return new ApiResponse.ApiResponseBuilder().code(500).message("卖家快递单号或phoneUid不能为空").build();
}
int result = buyerOrderService.addAbnormalPackage(req.getSellerWaybillCode());
int result = buyerOrderService.addAbnormalPackage(req.getSellerWaybillCode(), req.getPhoneUid());
if(result > 0) {
return new ApiResponse.ApiResponseBuilder().code(200).message("添加异常包裹成功").build();
}else {
... ...