Merge branch 'feature/se_compare' into feature/0611

@@ -52,7 +52,7 @@ se_vehicle_args = {
     'vehicleTransactionAmount': CustomDecimal(required=True),
     'vehicleTransactionAmount': CustomDecimal(required=True),
     'vinNo': fields.Str(required=True, validate=validate.Length(max=256)),
     'vinNo': fields.Str(required=True, validate=validate.Length(max=256)),
     'dealer': fields.Str(required=True, validate=validate.Length(max=256)),
     'dealer': fields.Str(required=True, validate=validate.Length(max=256)),
-    'option': fields.Str(required=False, validate=validate.Length(max=256)),
+    'option': CustomDecimal(required=False),
     'msrp': CustomDecimal(required=False),
     'msrp': CustomDecimal(required=False),
     'totalAmount': CustomDecimal(required=False),
     'totalAmount': CustomDecimal(required=False),
 }
 }
@@ -89,7 +89,7 @@ se_quotationt_args = {
     'totalLoanAmount': CustomDecimal(required=True),
     'totalLoanAmount': CustomDecimal(required=True),
     'loanTerm': fields.Int(required=True),
     'loanTerm': fields.Int(required=True),
     'vehiclePrincipal': CustomDecimal(required=True),
     'vehiclePrincipal': CustomDecimal(required=True),
-    'associatedServicePrincipal': CustomDecimal(required=True),
+    'associatedServicePrincipal': CustomDecimal(required=False),
     'associatedServiceInfo': fields.List(fields.Nested(se_associated_args), required=False),
     'associatedServiceInfo': fields.List(fields.Nested(se_associated_args), required=False),
     'monthlyPaymentInfo': fields.List(fields.Nested(se_payment_args), required=True, validate=validate.Length(min=1)),
     'monthlyPaymentInfo': fields.List(fields.Nested(se_payment_args), required=True, validate=validate.Length(min=1)),
 }
 }
@@ -158,7 +158,6 @@ se_individual_args = {
     'hukouCity': fields.Str(required=True, validate=validate.Length(max=64)),
     'hukouCity': fields.Str(required=True, validate=validate.Length(max=64)),
     'residentialProvince': fields.Str(required=False, validate=validate.Length(max=64)),
     'residentialProvince': fields.Str(required=False, validate=validate.Length(max=64)),
     'residentialCity': fields.Str(required=False, validate=validate.Length(max=64)),
     'residentialCity': fields.Str(required=False, validate=validate.Length(max=64)),
-    'propertyDocumentPolicy': fields.Str(required=False, validate=validate.Length(max=16)),
     'companyName': fields.Str(required=False, validate=validate.Length(max=256)),
     'companyName': fields.Str(required=False, validate=validate.Length(max=256)),
     'registeredCapital': CustomDecimal(required=False),
     'registeredCapital': CustomDecimal(required=False),
     'selfEmployedSubType': fields.Str(required=False, validate=validate.Length(max=16)),
     'selfEmployedSubType': fields.Str(required=False, validate=validate.Length(max=16)),
@@ -192,6 +191,7 @@ se_compare_content = {
     'applicationEntity': fields.Str(required=True, validate=validate.OneOf(consts.ENTITY)),
     'applicationEntity': fields.Str(required=True, validate=validate.OneOf(consts.ENTITY)),
     'customerType': fields.Str(required=True, validate=validate.OneOf(consts.CUSTOMER_TYPE)),
     'customerType': fields.Str(required=True, validate=validate.OneOf(consts.CUSTOMER_TYPE)),
     "firstSubmmisonDate": CustomDate(required=True),
     "firstSubmmisonDate": CustomDate(required=True),
+    'propertyDocumentPolicy': fields.Str(required=False, validate=validate.Length(max=16)),
 
 
     'individualCusInfo': fields.List(fields.Nested(se_individual_args),
     'individualCusInfo': fields.List(fields.Nested(se_individual_args),
                                      required=True, validate=validate.Length(min=1, max=4)),
                                      required=True, validate=validate.Length(min=1, max=4)),

@@ -173,11 +173,6 @@ SEindividualCusInfo:
       description: residentialCity
       description: residentialCity
       type: string
       type: string
       example: 连云港市
       example: 连云港市
-    propertyDocumentPolicy:
-      description: propertyDocumentPolicy
-      type: string
-      example: DOAOB
-      enum: [DOAOB, DOHDP, DOAMP, DOHED, DOAGQ, DOSME, DOLHK, DORET, DOPCQ, DOSNF, DOYES, DOGRC, DOLLR, DOVDL]
     companyName:
     companyName:
       description: companyName
       description: companyName
       type: string
       type: string
@@ -262,6 +257,11 @@ SEComparison:
           type: string
           type: string
           format: date
           format: date
           example: "2027-04-30"
           example: "2027-04-30"
+        propertyDocumentPolicy:
+          description: propertyDocumentPolicy
+          type: string
+          example: DOAOB
+          enum: [DOAOB, DOHDP, DOAMP, DOHED, DOAGQ, DOSME, DOLHK, DORET, DOPCQ, DOSNF, DOYES, DOGRC, DOLLR, DOVDL]
           
           
         individualCusInfo:
         individualCusInfo:
           description: individualCusInfo
           description: individualCusInfo
@@ -378,8 +378,9 @@ SEComparison:
               example: TestDealer
               example: TestDealer
             option:
             option:
               description: option
               description: option
-              type: string
-              example: TestOption
+              type: number
+              format: float
+              example: 1234.56
             msrp:
             msrp:
               description: msrp 
               description: msrp 
               type: number
               type: number
@@ -456,7 +457,7 @@ SEComparison:
         quotationtInfo:
         quotationtInfo:
           description: quotationtInfo
           description: quotationtInfo
           type: object
           type: object
-          required: [totalLoanAmount, loanTerm, vehiclePrincipal, associatedServicePrincipal, monthlyPaymentInfo]
+          required: [totalLoanAmount, loanTerm, vehiclePrincipal, monthlyPaymentInfo]
           properties: 
           properties: 
             totalLoanAmount:
             totalLoanAmount:
               description: totalLoanAmount
               description: totalLoanAmount