Merge remote-tracking branch 'origin/dev-1.6-shouqianba' into dev-1.6-shouqianba

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/AcquiringCreateData.java
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/CashierQueryData.java
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/CouponRefundData.java
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/CreateWechatPrepayOrderData.java
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/OrderCreateData.java
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/shouqianba/response/data/SettlementCreateData.java

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

 package com.liquidnet.service.goblin.param.shouqianba.request;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,6 +10,7 @@ public class CommonRequest {
 
     @Data
     @ApiModel(value = "商城信息")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Mall{
 
         @ApiModelProperty(required = true, value = "商城ID")
@@ -20,6 +22,7 @@ public class CommonRequest {
 
     @Data
     @ApiModel(value = "卖家信息/商户信息")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Seller {
         @ApiModelProperty(required = true, value = "商户ID")
         private String merchantId;
@@ -33,6 +36,7 @@ public class CommonRequest {
 
     @Data
     @ApiModel("买家信息")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Buyer{
         @ApiModelProperty(required = true, value = "买家ID（用户唯一标识）")
         private String buyerId;
@@ -40,6 +44,7 @@ public class CommonRequest {
 
     @Data
     @ApiModel("付款人信息")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Payer{
         @ApiModelProperty(required = true, value = "付款人ID")
         private String userId;
@@ -47,6 +52,7 @@ public class CommonRequest {
 
     @ApiModel(value = "收单信息")
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Acquiring{
         @ApiModelProperty(value = "收单号")
         private String acquiringSn;

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 com.liquidnet.service.goblin.param.shouqianba.request.CommonRequest;
 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

@@ -8,8 +8,8 @@ import lombok.Data;
 import java.util.List;
 
 @Data
+@ApiModel(value = "收银台查询Data")
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ApiModel(value = "自助收银查询响应数据")
 public class CashierQueryData {
 
     @ApiModelProperty(value = "支付工具列表")
@@ -38,6 +38,7 @@ public class CashierQueryData {
 
     @Data
     @ApiModel(value = "支付工具详情")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class PayTool {
         @ApiModelProperty(value = "支付工具id")
         private Long id;
@@ -69,6 +70,7 @@ public class CashierQueryData {
 
     @Data
     @ApiModel(value = "金额构成信息")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class AmountComposition {
         @ApiModelProperty(required = true, value = "金额构成项列表")
         private List<CompositionItem> compositionItems;
@@ -76,6 +78,7 @@ public class CashierQueryData {
 
     @Data
     @ApiModel(value = "金额构成项详情")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class CompositionItem {
         @ApiModelProperty(required = true, value = "构成项类目")
         private String category;
@@ -86,6 +89,7 @@ public class CashierQueryData {
 
     @Data
     @ApiModel(value = "收款方信息")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Payee {
         @ApiModelProperty(value = "商户id")
         private String merchantId;
@@ -105,6 +109,7 @@ public class CashierQueryData {
 
     @Data
     @ApiModel(value = "业务信息")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class BizInfo {
         @ApiModelProperty(value = "业务方")
         private String bizParty;
@@ -115,6 +120,7 @@ public class CashierQueryData {
 
     @Data
     @ApiModel(value = "金额明细模型")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class CashierAmount {
         @ApiModelProperty(value = "原始支付金额")
         private Long oriPaymentAmount;

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

@@ -9,6 +9,7 @@ import lombok.Data;
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel(value = "查询券码响应Data")
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class CouponQueryData {
 
     @ApiModelProperty(value = "券名称")

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

@@ -6,8 +6,8 @@ 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

@@ -6,8 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel(value = "创建微信预支付订单响应")
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ApiModel(value = "创建微信预支付订单响应数据内容")
 public class CreateWechatPrepayOrderData {
 
     @ApiModelProperty(value = "收单号")
@@ -30,6 +30,7 @@ public class CreateWechatPrepayOrderData {
 
     @Data
     @ApiModel(value = "订单金额明细")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class AmountDetails {
 
         @ApiModelProperty(value = "收单总金额")
@@ -44,6 +45,7 @@ public class CreateWechatPrepayOrderData {
 
     @Data
     @ApiModel(value = "支付凭证详情")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class PaymentVoucher {
 
         @ApiModelProperty(value = "时间戳")
@@ -67,6 +69,7 @@ public class CreateWechatPrepayOrderData {
 
     @Data
     @ApiModel(value = "通道信息详情")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ChannelInfo {
 
         @ApiModelProperty(value = "收钱吧通道流水号")

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

@@ -10,6 +10,7 @@ import java.util.List;
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel(value = "商城列表查询响应数据")
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class MallListQueryData {
 
     @ApiModelProperty("商城编号")
@@ -46,7 +47,7 @@ public class MallListQueryData {
     private String crossCityPaymentStatusDesc;
 
     @ApiModelProperty("应用类型 0拼塔商城 目前都是0，无需关注")
-    private String appType;
+    private Integer appType;
 
     @ApiModelProperty("行业code")
     private String industryCode;
@@ -70,6 +71,7 @@ public class MallListQueryData {
     @Data
     @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel("商户信息")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Seller {
         @ApiModelProperty("商户号")
         private String merchantSn;
@@ -99,6 +101,7 @@ public class MallListQueryData {
     @Data
     @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel("订单统计")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class OrderStatistics {
         @ApiModelProperty("订单数量")
         private Long totalNum;
@@ -113,6 +116,7 @@ public class MallListQueryData {
     @Data
     @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel("商户统计")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class SellerStatisticsModel {
         @ApiModelProperty("异地交易失败订单数量")
         private Long orderFailNum;
@@ -121,6 +125,7 @@ public class MallListQueryData {
     @Data
     @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel("跨城支付明细")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class CrossCityPayment {
         @ApiModelProperty("支付工具code 2:支付宝 3:微信")
         private Byte payToolCode;
@@ -129,7 +134,7 @@ public class MallListQueryData {
         private String payToolCodeDesc;
 
         @ApiModelProperty("大额开通状态")
-        private String status;
+        private Integer status;
 
         @ApiModelProperty("大额开通状态描述")
         private String statusDesc;

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

@@ -11,6 +11,7 @@ import java.util.List;
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel(value = "商城商品接口响应数据")
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class MallProductsQueryData {
 
     @ApiModelProperty(value = "商品spuId")
@@ -32,6 +33,7 @@ public class MallProductsQueryData {
     @Data
     @JsonIgnoreProperties(ignoreUnknown = true)
     @ApiModel(value = "商品规格")
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Sku {
 
         @ApiModelProperty(value = "库存类型")

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 com.liquidnet.service.goblin.param.shouqianba.request.CommonRequest;
 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

@@ -6,8 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel(value = "收钱吧创建结算明细响应参数Data")
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ApiModel(value = "创建结算Data")
 public class SettlementCreateData {
 
     @ApiModelProperty(value = "结算项ID）")

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin-test.yml

@@ -25,4 +25,13 @@ liquidnet:
         sub-app-id: 'wx4732efeaa2b08086'
         public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArR8pqWsRMqiunn8uEZGF9AeizJK0vuWjlcNnTbw9Sb96dMVuYu3SRj+Dx4E4SgyEL4CYROou1xwY57kAKEqHdH7o1W41O9jYjXZG38BrtBR+D9Qh9OqGxCZ+e4Gi38XHGg6fn67iXefOqp1kWGd4qc8tIZO1lIDXS19R09D/mESNBMulQdVPyZF7gvd11A+7EEOfRlSOjrtqIoUWV0GIqhLPUtGJk8Uq/d9NLitJyvK3tgz8cvJ4RyK6UpGtRDrqiBiQxbvK9EqMd1sw3zkvM03szSWon4LHFNqvDr6RYfFyFUCvX9UPYmeritENnroEuTBlTFLLb68ed4HZEZDPTQIDAQAB"
         private-key: "MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDJAOaA1ikJzDL0vUuTyl3/vlHyuSod6/gFLLrSTD6EJkma5Ld34HHu82/5pEojEvbcU113L9j3fUJlpyjX6CFk6j2KjMIuyFxhgrVFi5WT5m74wYohoWNifkQrgwsO3oxI7cewWFu/w7/yCK9dzI4QxasGUKH9iPweI+26IR0DBbOfC9GVudOy2b2xLrGAevEEHdVTNqrQNdlrTzqAH7r3uk8s2vaBZX+O4gyf7eKdHdC4CVSWfYPLO1sA48MxNwI7OExxfGeV+0wmBMGRSoZ5FhWsqZs+f9jGcmfF+uEfAO71PqHjezXYxq7+oWDfDBPCTc5fo9w5v1HV0aZaYOe1AgMBAAECggEBAI4yR98fInse7XF8NOpBwIv6/QhEfAoc9CHdCfFaJOPiHjIo2a5BpvhPWYj288eqU998TmPSAqDbCUzWm6taOb2lhJHukDT+Y3RMPqcLX275Fsp+SJUQEjoMb3eExh7ny8CQDrOvXoDkH3c/M6ic3Gf7Hslh46dz8D/2VOhXIqoObPlSLzniwiMTDBEwB7IRc3Q+r4V6ZnKt8wjKQZpotBA3TlJlEBBj/h5SbWokwMQbTqFkjl7gVe0ase2WfV+cD4qhPZx6CWphPVyWelg+wpDqXOIQdnE8pgri5a9ZkzgPTOrKyCm+EOa9lZAp81tnb2iFhrlkKPSWUW8zLtZzxMECgYEA+sNyF0U9anyxeKxXtlGKKuMHJSnBpZeU6FSvZjTewFH2Sxh3QwZjg6h5BfvTLH1XfNerx3gdpAPJ+EyAZuEibDr47bp+j4CtT27dVolz5XQ5ugOadwzdNZkq6vhuq1aGATmS/mlNE1/pdMEP9F6hi2HYncER6BFOy0xSwMKCnRECgYEAzTNxhvZ0pb2hPKylxHUydkm3Uznq5Zkquv6II6W5aiKvceETHwdRZLoKc+I0kd0/4fBfJI2Jsjexy51ERiG+8y4wVrcrky6NLw6mnXSvnTSQCftbexheJTg9c5dpfKIj+rxtuBeZ3Sj1MJQ6OSBUYu3iTqstO0Rgp/1ofWQJ8GUCgYEAspxzr0+KJ0cZwbI/54S8vT9n33iWjbQiRDnNlScjYij/HQ4YJI1wZF6jlTeBerbskeesWy+bLS/ltA4Jhz3knuKCXBHyA5TL3UBCN1lAS7c1RuE6LIHlLkAi6ap6aV//ou+3W671T0+JobfB/XVJ61WOTQ8wCfQKA5QhfVsOXYECgYEAvzbm3Ysfm6qfazi+p9lGErASov1fhGA8T1AMcJtnsh1sO8Qu20UodaJfRylNL3dqphIltpwl6eq4RTLhgjDEDTvHU6cQdfB1I5qVbDhlxSpL5uFRl91XLXvA18wKQledC3M3Esr7V/loscIOl1knCaD+t6wPVCEdqK0dB2uHT3kCgYEA3p3rlmCmWzkZ/U8jE4087YEkJWV+r86YC63r4YZEqZtfHk4hNchAYke4jYPqkTtmRVZi2C6KuVr5M3ASHmGWorBY0VA9Abd3daniNocZCeMOt4Z7U6MIbqW7KYSrjx8V8HIsdH7HF97ofRuMH6oaz9bFMM6XwrEAMY+zTdH9A4Y="
-        notify-url: 'https://testgoblin.zhengzai.tv/goblin/bracelet/callback'
+        notify-url: 'https://testgoblin.zhengzai.tv/goblin/bracelet/callback'
\ No newline at end of file
+  shouqianba:
+    base-api: 'https://open-apisix.iwosai.com'
+    app-id: '2025082700005615'
+    app-key: '4d5c7647853bba34a0b5af42bc2400e7'
+    app-code: 'DWTY'
+    public-key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Hlg887xrRWYxPqLDX53oimjsxfd7PDdhQ4zHUYA1eQP6PMyhAo+GU/oq4RQVpW6LrG0PWA6CoD7qva6T0NwsDWn5/fmWhmH+Ad6K5WG5jY9ZVjnys9R+HGeFyE7hSkhqSgiSlEMv9IBJD5p9ZqBZ0FAPotMS/RIBHANVA37J0Zlp9wakvUegcXb3hl9xp+aRsjikhS5h89qiPPXGkWq9dsQrbpDODP8RziqskxzIzu4tYtvLkUZ/Ak9LCRu63SSGX+yAj24mG9Q+4taWGX32AmuVFK9CGDoec0IYx8ouUtiGWVBqZz0dRteKbBbL6MtnPjUxT+wMc6rarPL8zj9vwIDAQAB'
+    merchant-id: 'fd567f94-9a44-4ae5-879f-9acc919d0f89'
+    merchant-user-id: '42c556cc-1509-4de0-bfc3-dfbcb48eae57'
+    role: 'super_admin'
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/test/java/com/liquidnet/service/goblin/test/GoblinShouQianBaServiceImplTest.java

@@ -31,8 +31,8 @@ public class GoblinShouQianBaServiceImplTest {
 
         CommonRequest.Seller seller = new CommonRequest.Seller();
         seller.setRole("super_admin");
-        seller.setMerchantId("1c904b2df056-4afa-a819-0328a4774320");
-        seller.setMerchantUserId("6ce169d1-1289-4e98-b4a3-ea8b6145046f");
+        seller.setMerchantId("fd567f94-9a44-4ae5-879f-9acc919d0f89");
+        seller.setMerchantUserId("42c556cc-1509-4de0-bfc3-dfbcb48eae57");
 
         MallListQueryRequest.Filter filter = new MallListQueryRequest.Filter();
         filter.setSeller(seller);