Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/ufo-platform into test6.8.4

@@ -325,7 +325,13 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     	bo.setExpressCompanyId(req.getExpressCompanyId());
     	bo.setWayBillCode(req.getWaybillCode());
     	bo.setDepotNum(req.getDepotNo());
-    	LOGGER.info("callAppraise orderCode is {}, startTime is {}", orderCode, DateUtil.getCurrentTimeSecond());
+		bo.setMobile(req.getMobile());
+
+		if(StringUtils.isBlank(bo.getMobile())){
+			throw new ServiceException(400,"错误：物流收货人手机号不能为空！");
+		}
+
+    	LOGGER.info("callAppraise orderCode is {}, AppraiseExpressInfoBo is {}, startTime is {}", orderCode, bo ,DateUtil.getCurrentTimeSecond());
     	
     	JSONObject jsonObject = serviceCaller.asyncCall(args, bo, JSONObject.class).get(5, TimeUnit.SECONDS);
     	LOGGER.info("callAppraise orderCode is {}, endTime is {}", orderCode, DateUtil.getCurrentTimeSecond());

@@ -750,6 +750,7 @@ function addQueryPage(skup, order_code, id) {
 function deliverGoods(id){
 	var expressCompanyId = $("#expressCompany").myCombobox("getValue");
 	var waybillCode = $("#waybillCode").textbox("getValue");
+    var mobile = $("#receiveInfo_mobile").val();
 	if(expressCompanyId==''){
 		alert("请选择快递公司！");
 		return;
@@ -758,11 +759,16 @@ function deliverGoods(id){
 		alert("请填写快递单号！");
 		return;
 	}
+    if(!mobile){
+        alert("收货人手机号为空！");
+        return;
+    }
 	$.post(contextPath + "/buyerOrder/updateOrderStatus", {
         id : id,
         status : 4,
         expressCompanyId : expressCompanyId,
         waybillCode : waybillCode,
+        mobile:mobile,
         depotNo: $("#depotNo").combobox("getValue") 
     }, function(data) {
         if (data.code == 200) {
@@ -785,6 +791,7 @@ function deliverGoods(id){
 function reBackGoods(id){
     var expressCompanyId = $("#expressCompany").myCombobox("getValue");
     var waybillCode = $("#waybillCode").textbox("getValue");
+    var mobile = $("#sendBackInfo_mobile").val();
     if(expressCompanyId==''){
         alert("请选择快递公司！");
         return;
@@ -793,11 +800,16 @@ function reBackGoods(id){
         alert("请填写快递单号！");
         return;
     }
+    if(!mobile){
+        alert("收货人手机号为空！");
+        return;
+    }
     $.post(contextPath + "/buyerOrder/returnBackOrder", {
         id : id,
         status : 17,
         expressCompanyId : expressCompanyId,
         waybillCode : waybillCode,
+        mobile:mobile,
         depotNo: $("#depotNo").combobox("getValue")
     }, function(data) {
         if (data.code == 200) {
@@ -818,6 +830,7 @@ function reBackGoods(id){
 function sendBackGoods(id){
 	var expressCompanyId = $("#expressCompany").myCombobox("getValue");
 	var waybillCode = $("#waybillCode").textbox("getValue");
+    var mobile = $("#sendBackInfo_mobile").val();
 	if(expressCompanyId==''){
 		alert("请选择快递公司！");
 		return;
@@ -826,11 +839,16 @@ function sendBackGoods(id){
 		alert("请填写快递单号！");
 		return;
 	}
+    if(!mobile){
+        alert("收货人手机号为空！");
+        return;
+    }
 	$.post(contextPath + "/buyerOrder/updateOrderStatus", {
         id : id,
         status : 13,
         expressCompanyId : expressCompanyId,
         waybillCode : waybillCode,
+        mobile:mobile,
         depotNo: $("#depotNo").combobox("getValue")
     }, function(data) {
         if (data.code == 200) {

@@ -12,6 +12,7 @@
        <tr>
            <td>买家地址：</td>
            <td colspan="2" >
+               <input type="hidden" id="receiveInfo_mobile"/>
                <span id="receiveInfo"></span>
            </td>
        </tr>
@@ -57,6 +58,8 @@
                 	 var name = result.data.receiveName;
                 	 var mobile = result.data.receiveMobile;
                 	 var address = result.data.receiveAddress;
+
+                	 $("#receiveInfo_mobile").val(mobile);
                 	 $("#receiveInfo").html("姓名：" + name + "<br>" + "手机号：" + mobile + "<br>" + "地址：" + address + "&nbsp;<button id='addressCopy'>复制</button>");
 
                      new ClipboardJS('#addressCopy', {

@@ -12,6 +12,7 @@
        <tr>
            <td>商品寄回地址：</td>
            <td colspan="2" >
+               <input type="hidden" id="sendBackInfo_mobile">
                <span id="sendBackInfo"></span>
            </td>
        </tr>
@@ -57,6 +58,8 @@
                 	 var name = result.data.receiveName;
                 	 var mobile = result.data.receiveMobile;
                 	 var address = result.data.receiveAddress;
+
+                	 $("#sendBackInfo_mobile").val(mobile);
                 	 $("#sendBackInfo").html("姓名：" + name + "<br>" + "手机号：" + mobile + "<br>" + "地址：" + address + "&nbsp;<button id='rejectAddressCopy'>复制</button>");
 
                      new ClipboardJS('#rejectAddressCopy', {