收钱吧JsonIgnoreProperties

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/request/MallProductsQueryRequest.java

@@ -17,4 +17,32 @@ public class MallProductsQueryRequest {
     @ApiModelProperty(value = "商城标识", required = true)
     private CommonRequest.Mall mallID;
 
+    @ApiModelProperty(value = "商品筛选条件")
+    private Filter filter;
+
+    @ApiModelProperty(value = "分页游标")
+    private Cursor cursor;
+
+    @Data
+    @ApiModel("商品筛选条件")
+    public static class Filter {
+        @ApiModelProperty(value = "商品ID (spuId)")
+        private String spuId;
+
+        @ApiModelProperty(value = "商品名称 (模糊查询)")
+        private String title;
+    }
+
+    @Data
+    @ApiModel("分页游标")
+    public static class Cursor {
+        @ApiModelProperty(value = "游标字段")
+        private String cursorField;
+
+        @ApiModelProperty(value = "查询数量")
+        private Integer count;
+
+        @ApiModelProperty(value = "结束游标")
+        private String endCursor;
+    }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/AcquiringCreateResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.param.shouqianba.response.data.AcquiringCreateData;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -8,5 +9,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "创建收单响应参数")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AcquiringCreateResponse extends BaseResponse<AcquiringCreateData> {
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/BaseResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel(value = "收钱吧基础响应参数")
 public class BaseResponse<T> {
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/CashierQueryResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.param.shouqianba.response.data.CashierQueryData;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -7,7 +8,8 @@ import lombok.EqualsAndHashCode;
 
 
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "查询收银台响应参数")
+@ApiModel(value = "自助收银查询响应")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class CashierQueryResponse extends BaseResponse<CashierQueryData>{
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/CouponQueryResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.param.shouqianba.response.data.CouponQueryData;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "查询券码响应")
+@ApiModel(value = "券详情查询响应")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class CouponQueryResponse extends BaseResponse<CouponQueryData>{
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/CouponRefundResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.param.shouqianba.response.data.CouponRefundData;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -8,5 +9,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "券退款响应")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class CouponRefundResponse extends BaseResponse<CouponRefundData>{
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/CouponStatusSyncResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "券码状态同步响应")
+@ApiModel(value = "券状态变更响应")
 @Data
-public class CouponStatusSyncResponse extends BaseResponse<Void>{
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CouponStatusSyncResponse extends BaseResponse<String>{
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/CreateWechatPrepayOrderResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.param.shouqianba.response.data.CreateWechatPrepayOrderData;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -8,5 +10,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "创建微信预支付订单响应")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class CreateWechatPrepayOrderResponse extends BaseResponse<CreateWechatPrepayOrderData>{
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/MallListQueryResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.param.shouqianba.response.data.MallListQueryData;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -9,6 +10,7 @@ import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel(value = "商城列表查询响应参数")
 public class MallListQueryResponse extends BaseResponse<List<MallListQueryData>> {
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/MallProductsQueryResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.param.shouqianba.response.data.MallProductsQueryData;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -10,5 +11,6 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "商城商品接口响应")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class MallProductsQueryResponse extends BaseResponse<List<MallProductsQueryData>>{
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/OrderCreateResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.param.shouqianba.response.data.OrderCreateData;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "创建订单响应参数")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class OrderCreateResponse extends BaseResponse<OrderCreateData>{
 
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/SettlementCreateResponse.java

 package com.liquidnet.service.goblin.param.shouqianba.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.param.shouqianba.response.data.SettlementCreateData;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "创建结算明细响应参数")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SettlementCreateResponse extends BaseResponse<SettlementCreateData> {
 
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/AcquiringCreateData.java

 package com.liquidnet.service.goblin.param.shouqianba.response.data;
 
 import com.liquidnet.service.goblin.param.shouqianba.request.CommonRequest;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel(value = "创建收单Data")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@ApiModel(value = "创建收单查询结果数据")
 public class AcquiringCreateData extends CommonRequest.Acquiring {
 
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/CashierQueryData.java

 package com.liquidnet.service.goblin.param.shouqianba.response.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,7 +8,8 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-@ApiModel(value = "收银台查询Data")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@ApiModel(value = "自助收银查询响应数据")
 public class CashierQueryData {
 
     @ApiModelProperty(value = "支付工具列表")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/CouponQueryData.java

 package com.liquidnet.service.goblin.param.shouqianba.response.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel(value = "查询券码响应Data")
 public class CouponQueryData {
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/CouponRefundData.java

 package com.liquidnet.service.goblin.param.shouqianba.response.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel(value = "券退款响应结果")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@ApiModel(value = "券退款Data")
 public class CouponRefundData {
 
     @ApiModelProperty(value = "退款单号")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/CreateWechatPrepayOrderData.java

 package com.liquidnet.service.goblin.param.shouqianba.response.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel(value = "创建微信预支付订单响应")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@ApiModel(value = "创建微信预支付订单响应数据内容")
 public class CreateWechatPrepayOrderData {
 
     @ApiModelProperty(value = "收单号")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/MallListQueryData.java

 package com.liquidnet.service.goblin.param.shouqianba.response.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel(value = "商城列表查询响应数据")
 public class MallListQueryData {
 
@@ -66,6 +68,7 @@ public class MallListQueryData {
 
 
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel("商户信息")
     public static class Seller {
         @ApiModelProperty("商户号")
@@ -94,6 +97,7 @@ public class MallListQueryData {
     }
 
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel("订单统计")
     public static class OrderStatistics {
         @ApiModelProperty("订单数量")
@@ -107,6 +111,7 @@ public class MallListQueryData {
     }
 
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel("商户统计")
     public static class SellerStatisticsModel {
         @ApiModelProperty("异地交易失败订单数量")
@@ -114,6 +119,7 @@ public class MallListQueryData {
     }
 
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel("跨城支付明细")
     public static class CrossCityPayment {
         @ApiModelProperty("支付工具code 2:支付宝 3:微信")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/MallProductsQueryData.java

 package com.liquidnet.service.goblin.param.shouqianba.response.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,6 +9,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel(value = "商城商品接口响应数据")
 public class MallProductsQueryData {
 
@@ -28,6 +30,7 @@ public class MallProductsQueryData {
 
 
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel(value = "商品规格")
     public static class Sku {
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/OrderCreateData.java

 package com.liquidnet.service.goblin.param.shouqianba.response.data;
 
 import com.liquidnet.service.goblin.param.shouqianba.request.CommonRequest;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.security.core.parameters.P;
 
 @Data
-@ApiModel(value = "收钱吧创建订单响应参数Data")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@ApiModel(value = "创建订单Data")
 public class OrderCreateData {
 
     @ApiModelProperty(value = "订单编号）")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/SettlementCreateData.java

 package com.liquidnet.service.goblin.param.shouqianba.response.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel(value = "收钱吧创建结算明细响应参数Data")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@ApiModel(value = "创建结算Data")
 public class SettlementCreateData {
 
     @ApiModelProperty(value = "结算项ID）")