ufo / ufo-platform · Commits

Go to a project

Authored by qinchao
Commit 0298dafe25e20d9e19a4fa9d548b441d4fc9edbc 1 parent 16b817c4

修改提示

Inline Side-by-side
Showing 2 changed files with 16 additions and 16 deletions
@@ -70,7 +70,7 @@ public class BuyerOrderController { @@ -70,7 +70,7 @@ public class BuyerOrderController {
70 if(result!=null&&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==null?"确认收货失败":result.getString("message")).build(); 73 + return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
74 } 74 }
75 } 75 }
76 76
@@ -79,10 +79,10 @@ public class BuyerOrderController { @@ -79,10 +79,10 @@ public class BuyerOrderController {
79 public ApiResponse qualityCheckPass(BuyerOrderReq req) { 79 public ApiResponse qualityCheckPass(BuyerOrderReq req) {
80 LOGGER.info("qualityCheckPass in. req is {}", req); 80 LOGGER.info("qualityCheckPass in. req is {}", req);
81 JSONObject result = buyerOrderService.qualityCheckPass(req); 81 JSONObject result = buyerOrderService.qualityCheckPass(req);
82 - if(result.getIntValue("code") == 200) { 82 + if(result!=null&&result.getIntValue("code") == 200) {
83 return new ApiResponse.ApiResponseBuilder().code(200).message("质检通过成功").build(); 83 return new ApiResponse.ApiResponseBuilder().code(200).message("质检通过成功").build();
84 }else { 84 }else {
85 - return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build(); 85 + return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
86 } 86 }
87 } 87 }
88 88
@@ -91,10 +91,10 @@ public class BuyerOrderController { @@ -91,10 +91,10 @@ public class BuyerOrderController {
91 public ApiResponse qualityCheckNotPass(BuyerOrderReq req) { 91 public ApiResponse qualityCheckNotPass(BuyerOrderReq req) {
92 LOGGER.info("qualityCheckNotPass in. req is {}", req); 92 LOGGER.info("qualityCheckNotPass in. req is {}", req);
93 JSONObject result = buyerOrderService.qualityCheckNotPass(req); 93 JSONObject result = buyerOrderService.qualityCheckNotPass(req);
94 - if(result.getIntValue("code") == 200) { 94 + if(result!=null&&result.getIntValue("code") == 200) {
95 return new ApiResponse.ApiResponseBuilder().code(200).message("质检不通过成功").build(); 95 return new ApiResponse.ApiResponseBuilder().code(200).message("质检不通过成功").build();
96 }else { 96 }else {
97 - return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build(); 97 + return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
98 } 98 }
99 } 99 }
100 100
@@ -103,10 +103,10 @@ public class BuyerOrderController { @@ -103,10 +103,10 @@ public class BuyerOrderController {
103 public ApiResponse miniFaultConfirm(BuyerOrderReq req) { 103 public ApiResponse miniFaultConfirm(BuyerOrderReq req) {
104 LOGGER.info("miniFaultConfirm in. req is {}", req); 104 LOGGER.info("miniFaultConfirm in. req is {}", req);
105 JSONObject result = buyerOrderService.miniFaultCreate(req); 105 JSONObject result = buyerOrderService.miniFaultCreate(req);
106 - if(result.getIntValue("code") == 200) { 106 + if(result!=null&&result.getIntValue("code") == 200) {
107 return new ApiResponse.ApiResponseBuilder().code(200).message("瑕疵确认成功").build(); 107 return new ApiResponse.ApiResponseBuilder().code(200).message("瑕疵确认成功").build();
108 }else { 108 }else {
109 - return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build(); 109 + return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
110 } 110 }
111 } 111 }
112 112
@@ -127,10 +127,10 @@ public class BuyerOrderController { @@ -127,10 +127,10 @@ public class BuyerOrderController {
127 public ApiResponse judgeCenterPass(String orderCode) { 127 public ApiResponse judgeCenterPass(String orderCode) {
128 LOGGER.info("judgeCenterPass in. req is {}", orderCode); 128 LOGGER.info("judgeCenterPass in. req is {}", orderCode);
129 JSONObject result = buyerOrderService.judgeCenterPass(orderCode); 129 JSONObject result = buyerOrderService.judgeCenterPass(orderCode);
130 - if(result.getIntValue("code") == 200) { 130 + if(result!=null&&result.getIntValue("code") == 200) {
131 return new ApiResponse.ApiResponseBuilder().code(200).message("鉴定通过完成").build(); 131 return new ApiResponse.ApiResponseBuilder().code(200).message("鉴定通过完成").build();
132 }else { 132 }else {
133 - return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build(); 133 + return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
134 } 134 }
135 } 135 }
136 136
@@ -139,10 +139,10 @@ public class BuyerOrderController { @@ -139,10 +139,10 @@ public class BuyerOrderController {
139 public ApiResponse judgeCenterNotPass(String orderCode) { 139 public ApiResponse judgeCenterNotPass(String orderCode) {
140 LOGGER.info("judgeCenterNotPass in. req is {}", orderCode); 140 LOGGER.info("judgeCenterNotPass in. req is {}", orderCode);
141 JSONObject result = buyerOrderService.judgeCenterNotPass(orderCode); 141 JSONObject result = buyerOrderService.judgeCenterNotPass(orderCode);
142 - if(result.getIntValue("code") == 200) { 142 + if(result!=null&&result.getIntValue("code") == 200) {
143 return new ApiResponse.ApiResponseBuilder().code(200).message("鉴定不通过完成").build(); 143 return new ApiResponse.ApiResponseBuilder().code(200).message("鉴定不通过完成").build();
144 }else { 144 }else {
145 - return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build(); 145 + return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
146 } 146 }
147 } 147 }
148 148
@@ -800,7 +800,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -800,7 +800,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
800 LOGGER.info("qualityCheckNotPass insert db success! orderCode={},record={}", orderCode,record); 800 LOGGER.info("qualityCheckNotPass insert db success! orderCode={},record={}", orderCode,record);
801 801
802 if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){ 802 if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){
803 - throw new ServiceException(400,"错误：订单状态变化，请重新刷新列表"); 803 + throw new ServiceException(400,"错误：订单状态变化，操作[质检不通过]失败，请重新刷新列表");
804 } 804 }
805 805
806 //记录操作日志 806 //记录操作日志
@@ -844,7 +844,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -844,7 +844,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
844 LOGGER.info("miniFaultCreate insert db success! orderCode={}, record={}", orderCode,record); 844 LOGGER.info("miniFaultCreate insert db success! orderCode={}, record={}", orderCode,record);
845 845
846 if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){ 846 if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){
847 - throw new ServiceException(400,"错误：订单状态变化，请重新刷新列表"); 847 + throw new ServiceException(400,"错误：订单状态变化，操作[瑕疵确认]失败，请重新刷新列表");
848 } 848 }
849 849
850 //记录操作日志 850 //记录操作日志
@@ -892,7 +892,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -892,7 +892,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
892 } 892 }
893 893
894 if( Constant.BUYER_ORDER_STATUS_JUDGING.getByteVal()!=buyerOrder.getStatus().byteValue()){ 894 if( Constant.BUYER_ORDER_STATUS_JUDGING.getByteVal()!=buyerOrder.getStatus().byteValue()){
895 - throw new ServiceException(400,"错误：订单状态变化，不允许鉴定通过,请重新刷新列表"); 895 + throw new ServiceException(400,"错误：订单状态变化，操作[鉴定通过且发货]失败,请重新刷新列表");
896 } 896 }
897 897
898 898
@@ -926,7 +926,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -926,7 +926,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
926 } 926 }
927 927
928 if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){ 928 if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){
929 - throw new ServiceException(400,"错误：订单状态变化,鉴定通过失败,请重新刷新列表"); 929 + throw new ServiceException(400,"错误：订单状态变化,操作[鉴定通过]失败,请重新刷新列表");
930 } 930 }
931 931
932 //记录操作日志 932 //记录操作日志
@@ -955,7 +955,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -955,7 +955,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
955 } 955 }
956 956
957 if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){ 957 if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){
958 - throw new ServiceException(400,"错误：订单状态变化,鉴定不通过失败,请重新刷新列表"); 958 + throw new ServiceException(400,"错误：订单状态变化,操作[鉴定不通过]失败,请重新刷新列表");
959 } 959 }
960 960
961 //记录操作日志 961 //记录操作日志