Merge branch 'test6.9.14' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.14

@@ -71,7 +71,9 @@ public class ActionStatusHold {
             canModifyAddressStatus = Arrays.asList(
                     OrderStatus.HAS_PAYED.getCode(),
                     OrderStatus.SELLER_SEND_OUT.getCode(),
-                    OrderStatus.PLATFORM_RECEIVE.getCode()
+                    OrderStatus.PLATFORM_RECEIVE.getCode(),
+                    OrderStatus.MINI_FAULT_WAITING.getCode(),
+                    OrderStatus.MINI_FAULT_ACCEPT.getCode()
             );
         }
 

@@ -3,6 +3,7 @@ package com.yohoufo.order.convert;
 import com.alibaba.fastjson.JSONObject;
 import com.yohobuy.ufo.model.order.req.OrderAddressReq;
 import com.yohobuy.ufo.model.order.vo.AddressInfo;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Objects;
 
@@ -84,7 +85,9 @@ public class AddressInfoConvertor {
     private static void mergeChangedAddress4Hidden(AddressInfo hiddenAddress,
                                                   AddressInfo hiddenAddressTemp){
         hiddenAddress.setArea(hiddenAddressTemp.getArea());
-        hiddenAddress.setAreaCode(hiddenAddressTemp.getAreaCode());
+        if (StringUtils.isNotBlank(hiddenAddressTemp.getAreaCode())){
+            hiddenAddress.setAreaCode(hiddenAddressTemp.getAreaCode());
+        }
         hiddenAddress.setMobile(hiddenAddressTemp.getMobile());
         hiddenAddress.setConsignee(hiddenAddressTemp.getConsignee());
         hiddenAddress.setAddress(hiddenAddressTemp.getAddress());

@@ -151,15 +151,7 @@ public class BuyerOrderMetaServiceImpl implements IBuyerOrderMetaService {
         }
         AddressInfoConvertor.mergeChangedAddress4NoHidden(noHiddenAddress, changedAddressFromReq, isFromPlatform);
 
-        String str_address = noHiddenAddress.getAddress();
-        String str_consignee = noHiddenAddress.getConsignee();
-        String str_mobile = noHiddenAddress.getMobile();
-
-        AddressInfo changedAddress = new AddressInfo();
-        changedAddress.setAddress(str_address);
-        changedAddress.setConsignee(str_consignee);
-        changedAddress.setMobile(str_mobile);
-        AddressInfo hiddenAddressOfChanged = commomAddressService.buildHiddenAddress(changedAddress);
+        AddressInfo hiddenAddressOfChanged = commomAddressService.buildHiddenAddress(changedAddressFromReq);
         AddressInfoConvertor.mergeChangedAddress4Hidden(hiddenAddress, isFromPlatform, hiddenAddressOfChanged);
         String rtn="";
         int updateRowNum=0;