ufo / ufo-platform · Commits

Go to a project

Authored by qinchao
Commit 16b817c45919df94d949d0a57c408d74dd26882e 1 parent a5cfa26a

兼容确认收货接口，兼容orderCode

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -67,10 +67,10 @@ public class BuyerOrderController { @@ -67,10 +67,10 @@ public class BuyerOrderController {
67 public ApiResponse confirmReceive(BuyerOrderReq req) { 67 public ApiResponse confirmReceive(BuyerOrderReq req) {
68 LOGGER.info("confirmReceive in. req is {}", req); 68 LOGGER.info("confirmReceive in. req is {}", req);
69 JSONObject result = buyerOrderService.confirmReceive(req); 69 JSONObject result = buyerOrderService.confirmReceive(req);
70 - if(result.getIntValue("code") == 200) { 70 + if(result!=null&&result.getIntValue("code") == 200) {
71 return new ApiResponse.ApiResponseBuilder().code(200).message("确认收货成功").build(); 71 return new ApiResponse.ApiResponseBuilder().code(200).message("确认收货成功").build();
72 }else { 72 }else {
73 - return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build(); 73 + return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"确认收货失败":result.getString("message")).build();
74 } 74 }
75 } 75 }
76 76