Merge branch 'hotfix_qc_tab_20190701' into test6.9.7

# Conflicts:
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java

@@ -980,6 +980,9 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 			saveOrderOperateRecord(buyerOrder.getOrderCode(),userHelper, operateType, ""); //记录操作日志
 			saveOrderOperateRecord(buyerOrder.getOrderCode(),userHelper, operateType, ""); //记录操作日志
 			LOGGER.info("confirmReceive saveOrderOperateRecord operateType={} ,order code ={} ,userHelper = {} ,result json {}",operateType,buyerOrder.getOrderCode() ,userHelper,jsonObject);
 			LOGGER.info("confirmReceive saveOrderOperateRecord operateType={} ,order code ={} ,userHelper = {} ,result json {}",operateType,buyerOrder.getOrderCode() ,userHelper,jsonObject);
 		}
 		}
+		
+		//签收
+		signForPackage(sellerWaybillCode, getDepotNoByPhoneUid(req.getPhoneUid()));
 	}
 	}
 	
 	
 	private List<Long> convertStringToLong(List<String> orderCodeList){
 	private List<Long> convertStringToLong(List<String> orderCodeList){
@@ -2645,6 +2648,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
     	for(BuyerOrder order : orderList) {
     	for(BuyerOrder order : orderList) {
     		saveOrderOperateRecord(order.getOrderCode(), new UserHelper(), OperateTypeEnum.OPERATE_TYPE_SET_TO_ABNORMAL.getCode(), "");
     		saveOrderOperateRecord(order.getOrderCode(), new UserHelper(), OperateTypeEnum.OPERATE_TYPE_SET_TO_ABNORMAL.getCode(), "");
     	}
     	}
+    	if(num > 0) {
+    		//签收
+        	signForPackage(sellerWaybillCode, depotNo);
+    	}
     	
     	
     	return num;
     	return num;
     }
     }