物流

@@ -64,7 +64,8 @@ public class AppraiseController {
     public ApiResponse appraiseFail(@RequestBody AppraiseExpressInfoBo appraiseExpressInfoBo) {
         logger.info("in appraise Fail, req {}", appraiseExpressInfoBo);
         OrderStatus expectStatus = OrderStatus.PLATFORM_CHECKING;
-        return  appraiseService.appraiseFail(appraiseExpressInfoBo,expectStatus,true);
+        int type= 1; //1 鉴定不通过  ；2 质检不通过 ； 3,瑕疵确认不通过
+        return  appraiseService.appraiseFail(appraiseExpressInfoBo,expectStatus,type);
     }
 
     /**
@@ -80,7 +81,8 @@ public class AppraiseController {
     public ApiResponse appraiseFailWithoutExpress(@RequestBody AppraiseExpressInfoBo appraiseExpressInfoBo) {
         logger.info("in appraiseFailWithoutExpress , req {}", appraiseExpressInfoBo);
         OrderStatus expectStatus = OrderStatus.PLATFORM_RECEIVE;
-        return  appraiseService.appraiseFail( appraiseExpressInfoBo,expectStatus,false);
+        int type= 2; //1 鉴定不通过  ；2 质检不通过 ； 3,瑕疵确认不通过
+        return  appraiseService.appraiseFail( appraiseExpressInfoBo,expectStatus,type);
     }
 
 

@@ -434,10 +434,12 @@ public class AppraiseService {
      * 更新发到卖家的物流信息
      * 将卖家的保证金分账给平台和买家
      * 更新买家订单状态
+     * type  //1 鉴定不通过  ；2 质检不通过 ； 3,瑕疵确认不通过
      * @return
      */
-    public ApiResponse appraiseFail(AppraiseExpressInfoBo appraiseExpressInfoBo,OrderStatus expectStatus,boolean sendExpressFlag){
-        LOGGER.info("appraiseFail enter  , appraiseExpressInfoBo  {} ,sendExpressFlag {}", appraiseExpressInfoBo ,sendExpressFlag);
+    public ApiResponse appraiseFail(AppraiseExpressInfoBo appraiseExpressInfoBo,OrderStatus expectStatus,int type){
+
+        LOGGER.info("appraiseFail enter  , appraiseExpressInfoBo  {} ,type {}", appraiseExpressInfoBo ,type);
         Integer expressCompanyId = appraiseExpressInfoBo.getExpressCompanyId();
         Long orderCode = appraiseExpressInfoBo.getOrderCode();
         String wayBillCode = appraiseExpressInfoBo.getWayBillCode();
@@ -568,15 +570,20 @@ public class AppraiseService {
             }finally {
                 //更新物流信息,写到最后
                 //鉴定不通过，发物流
-                if(sendExpressFlag){
+                EnumExpressDataOperateTransferCode operateTransferCode = null;
+                if(type == 1){
+                    //鉴定不通过，发物流
                     expressInfoService.returnBackOrderCauseOfJudgeFailure(sellerUid, expressCompanyId, orderCode, wayBillCode, depotNum,mobile);
+                    operateTransferCode = EnumExpressDataOperateTransferCode.judge_reject;
+                }else if(type == 2){
+                    //质检不通过，不发物流
+                    operateTransferCode = EnumExpressDataOperateTransferCode.quality_check_reject;
                 }
 
 
                 //记录调拨信息(只保存卖家一条)
                 EnumExpressType expressType = EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER;
                 EnumExpressDataType expressDataType = EnumExpressDataType.operate_transfer;
-                EnumExpressDataOperateTransferCode operateTransferCode = EnumExpressDataOperateTransferCode.judge_reject;
                 //expressInfoService.saveOperateTransferExpressInfo(buyerUid,orderCode,expressType.getCode(),expressDataType,operateTransferCode);
                 expressInfoService.saveOperateTransferExpressInfo(sellerUid,orderCode,expressType.getCode(),expressDataType,operateTransferCode);
             }

@@ -736,7 +736,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
             //记录调拨信息(只保存卖家一条)
             EnumExpressType expressType = EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER;
             EnumExpressDataType expressDataType = EnumExpressDataType.operate_transfer;
-            EnumExpressDataOperateTransferCode operateTransferCode = EnumExpressDataOperateTransferCode.judge_begin;
+            EnumExpressDataOperateTransferCode operateTransferCode = EnumExpressDataOperateTransferCode.quality_check_pass;
             //expressInfoService.saveOperateTransferExpressInfo(uid,orderCode,expressType.getCode(),expressDataType,operateTransferCode);
             expressInfoService.saveOperateTransferExpressInfo(sellerUid,orderCode,expressType.getCode(),expressDataType,operateTransferCode);