急速发货

@@ -245,7 +245,7 @@ public class ErpFastDeliveryServiceImpl implements IErpFastDeliveryService {
         buyerOrderResp.setOrderCode(buyerOrderCode);
         buyerOrderResp.setStatus(buyerOrder.getStatus());
         buyerOrderResp.setStatusDesc(OrderStatus.getOrderStatus(buyerOrder.getStatus()).getDesc());
-        sellerOrder.setBuyerOrderCode(buyerOrderResp);
+        sellerOrder.setBuyerOrder(buyerOrderResp);
 
         if (buyerOrderToTradeBills == null){
             return sellerOrder;

@@ -49,12 +49,12 @@ public class SellerAddressService {
 
     public int saveBatchSendBackAddress(SellerOrderContext ctx, List<Integer> skupIds){
         int result = 0;
+        if (ctx.getBackAddress() == null || ctx.getBackHiddenAddress() == null){
+            return result;
+        }
         String value = JSONObject.toJSONString(ctx.getBackAddress());
 
         String hValue = JSONObject.toJSONString(ctx.getBackHiddenAddress());
-        if (StringUtils.isEmpty(value) || StringUtils.isBlank(hValue)){
-            return result;
-        }
         List<SellerOrderMeta> list = new ArrayList<>( 2*skupIds.size() );
         for(Integer skupId : skupIds){
             SellerOrderMeta som = new SellerOrderMeta();