From 44728a2fd9ab211129491e59f06290a026cec509 Mon Sep 17 00:00:00 2001
From: linsm <linsiming@we-zone.com>
Date: Mon, 17 May 2021 19:25:39 +0800
Subject: [PATCH] =?UTF-8?q?OrderFulfillment=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/feeds/OrderFulfillment.java         | 44 ++++++++++++++-----
 src/main/resources/xsds/OrderFulfillment.xsd  | 17 ++++---
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/amazon/SellingPartnerAPI/model/feeds/OrderFulfillment.java b/src/main/java/com/amazon/SellingPartnerAPI/model/feeds/OrderFulfillment.java
index f61f2f8..5bd19d2 100644
--- a/src/main/java/com/amazon/SellingPartnerAPI/model/feeds/OrderFulfillment.java
+++ b/src/main/java/com/amazon/SellingPartnerAPI/model/feeds/OrderFulfillment.java
@@ -2,7 +2,7 @@
 // 此文件是由 JavaTM Architecture for XML Binding (JAXB) 引用实现 v2.2.8-b130911.1802 生成的
 // 请访问 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // 在重新编译源模式时, 对此文件的所有修改都将丢失。
-// 生成时间: 2021.01.19 时间 06:09:39 PM CST 
+// 生成时间: 2021.05.17 时间 05:41:36 PM CST 
 //
 
 
@@ -43,10 +43,8 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *             &lt;complexContent>
  *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *                 &lt;sequence>
- *                   &lt;choice>
- *                     &lt;element ref="{}CarrierCode"/>
- *                     &lt;element name="CarrierName" type="{}String"/>
- *                   &lt;/choice>
+ *                   &lt;element ref="{}CarrierCode" minOccurs="0"/>
+ *                   &lt;element name="CarrierName" type="{}String" minOccurs="0"/>
  *                   &lt;element name="ShippingMethod" type="{}String" minOccurs="0"/>
  *                   &lt;element name="ShipperTrackingNumber" type="{}String" minOccurs="0"/>
  *                 &lt;/sequence>
@@ -78,6 +76,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *             &lt;/complexContent>
  *           &lt;/complexType>
  *         &lt;/element>
+ *         &lt;element name="ShipFromAddress" type="{}AddressType" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -94,7 +93,8 @@ import javax.xml.datatype.XMLGregorianCalendar;
     "fulfillmentDate",
     "fulfillmentData",
     "codCollectionMethod",
-    "item"
+    "item",
+    "shipFromAddress"
 })
 @XmlRootElement(name = "OrderFulfillment")
 public class OrderFulfillment {
@@ -117,6 +117,8 @@ public class OrderFulfillment {
     protected String codCollectionMethod;
     @XmlElement(name = "Item")
     protected List<OrderFulfillment.Item> item;
+    @XmlElement(name = "ShipFromAddress")
+    protected AddressType shipFromAddress;
 
     /**
      * 获取amazonOrderID属性的值。
@@ -291,6 +293,30 @@ public class OrderFulfillment {
         return this.item;
     }
 
+    /**
+     * 获取shipFromAddress属性的值。
+     * 
+     * @return
+     *     possible object is
+     *     {@link AddressType }
+     *     
+     */
+    public AddressType getShipFromAddress() {
+        return shipFromAddress;
+    }
+
+    /**
+     * 设置shipFromAddress属性的值。
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AddressType }
+     *     
+     */
+    public void setShipFromAddress(AddressType value) {
+        this.shipFromAddress = value;
+    }
+
 
     /**
      * <p>anonymous complex type的 Java 类。
@@ -302,10 +328,8 @@ public class OrderFulfillment {
      *   &lt;complexContent>
      *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
      *       &lt;sequence>
-     *         &lt;choice>
-     *           &lt;element ref="{}CarrierCode"/>
-     *           &lt;element name="CarrierName" type="{}String"/>
-     *         &lt;/choice>
+     *         &lt;element ref="{}CarrierCode" minOccurs="0"/>
+     *         &lt;element name="CarrierName" type="{}String" minOccurs="0"/>
      *         &lt;element name="ShippingMethod" type="{}String" minOccurs="0"/>
      *         &lt;element name="ShipperTrackingNumber" type="{}String" minOccurs="0"/>
      *       &lt;/sequence>
diff --git a/src/main/resources/xsds/OrderFulfillment.xsd b/src/main/resources/xsds/OrderFulfillment.xsd
index 799fb2e..030cd39 100644
--- a/src/main/resources/xsds/OrderFulfillment.xsd
+++ b/src/main/resources/xsds/OrderFulfillment.xsd
@@ -6,9 +6,9 @@
     $Date: 2005/04/01 $
 
     AMAZON.COM CONFIDENTIAL.  This document and the information contained in it are
-    confidential and proprietary information of Amazon.com and may not be reproduced, 
-    distributed or used, in whole or in part, for any purpose other than as necessary 
-    to list products for sale on the www.amazon.com web site pursuant to an agreement 
+    confidential and proprietary information of Amazon.com and may not be reproduced,
+    distributed or used, in whole or in part, for any purpose other than as necessary
+    to list products for sale on the www.amazon.com web site pursuant to an agreement
     with Amazon.com.
     -->
 
@@ -26,10 +26,8 @@
                 <xsd:element name="FulfillmentData" minOccurs="0">
                     <xsd:complexType>
                         <xsd:sequence>
-                            <xsd:choice>
-                                <xsd:element ref="CarrierCode"/>
-                                <xsd:element name="CarrierName" type="String"/>
-                            </xsd:choice>
+                            <xsd:element ref="CarrierCode" minOccurs="0"/>
+                            <xsd:element name="CarrierName" type="String" minOccurs="0"/>
                             <xsd:element name="ShippingMethod" type="String" minOccurs="0"/>
                             <xsd:element name="ShipperTrackingNumber" type="String" minOccurs="0"/>
                         </xsd:sequence>
@@ -52,12 +50,13 @@
                                 <xsd:element ref="MerchantOrderItemID"/>
                             </xsd:choice>
                             <xsd:element name="MerchantFulfillmentItemID" type="IDNumber"
-                                minOccurs="0"/>
+                                         minOccurs="0"/>
                             <xsd:element name="Quantity" type="xsd:positiveInteger" minOccurs="0"/>
-                             <xsd:element name="TransparencyCode" type="xsd:string" minOccurs="0" maxOccurs="10"/>
+                            <xsd:element name="TransparencyCode" type="xsd:string" minOccurs="0" maxOccurs="10"/>
                         </xsd:sequence>
                     </xsd:complexType>
                 </xsd:element>
+                <xsd:element name="ShipFromAddress" type="AddressType" minOccurs="0" />
 
             </xsd:sequence>
         </xsd:complexType>