Authored by qinchao

Merge branch 'dev_685_质检状态拆分' into test6.8.5

@@ -92,7 +92,7 @@ public class BuyerOrderController { @@ -92,7 +92,7 @@ public class BuyerOrderController {
92 @RequestMapping(value = "/miniFaultConfirm") 92 @RequestMapping(value = "/miniFaultConfirm")
93 public ApiResponse miniFaultConfirm(BuyerOrderReq req) { 93 public ApiResponse miniFaultConfirm(BuyerOrderReq req) {
94 LOGGER.info("miniFaultConfirm in. req is {}", req); 94 LOGGER.info("miniFaultConfirm in. req is {}", req);
95 - JSONObject result = buyerOrderService.miniFaultConfirm(req); 95 + JSONObject result = buyerOrderService.miniFaultCreate(req);
96 if(result.getIntValue("code") == 200) { 96 if(result.getIntValue("code") == 200) {
97 return new ApiResponse.ApiResponseBuilder().code(200).message("瑕疵确认成功").build(); 97 return new ApiResponse.ApiResponseBuilder().code(200).message("瑕疵确认成功").build();
98 }else { 98 }else {
@@ -33,7 +33,7 @@ public interface IBuyerOrderService { @@ -33,7 +33,7 @@ public interface IBuyerOrderService {
33 JSONObject qualityCheckPass(BuyerOrderReq req); 33 JSONObject qualityCheckPass(BuyerOrderReq req);
34 34
35 JSONObject qualityCheckNotPass(BuyerOrderReq req); 35 JSONObject qualityCheckNotPass(BuyerOrderReq req);
36 - JSONObject miniFaultConfirm(BuyerOrderReq req); 36 + JSONObject miniFaultCreate(BuyerOrderReq req);
37 37
38 JSONObject judgePass(BuyerOrderReq req); 38 JSONObject judgePass(BuyerOrderReq req);
39 39
@@ -448,11 +448,11 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -448,11 +448,11 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
448 return jsonObject; 448 return jsonObject;
449 } 449 }
450 450
451 - public JSONObject miniFaultConfirm(BuyerOrderReq req){ 451 + public JSONObject miniFaultCreate(BuyerOrderReq req){
452 BuyerOrder buyerOrder = checkParam(req); 452 BuyerOrder buyerOrder = checkParam(req);
453 453
454 //调用鉴定不通过接口 454 //调用鉴定不通过接口
455 - String args = "ufo-gateway.miniFaultConfirm"; 455 + String args = "ufo-gateway.miniFaultCreate";
456 JSONObject jsonObject = asyncCallConfirmReceive(args, buyerOrder.getOrderCode()); 456 JSONObject jsonObject = asyncCallConfirmReceive(args, buyerOrder.getOrderCode());
457 457
458 //记录操作日志 458 //记录操作日志