正元同步

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/api/feign/RemoterThirdZyService.java

@@ -4,6 +4,10 @@ import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
 import com.bsd.pjcloud.thirdparty.dto.zy.foreign.ZyForeignSyncNativeCardTradeInfoDto;
+import com.bsd.pjcloud.thirdparty.dto.zy.mer.ZyMerSyncAccClassInfoDto;
+import com.bsd.pjcloud.thirdparty.dto.zy.mer.ZyMerSyncAccountInfoDto;
+import com.bsd.pjcloud.thirdparty.dto.zy.mer.ZyMerSyncDealerInfoDto;
+import com.bsd.pjcloud.thirdparty.dto.zy.mer.ZyMerSyncEnterpriseInfoDto;
 import com.bsd.pjcloud.thirdparty.dto.zy.stride.ZyStrideAuthenticationDto;
 import com.bsd.pjcloud.thirdparty.dto.zy.stride.ZyStrideConsumptionDto;
 import com.bsd.pjcloud.thirdparty.dto.zy.stride.ZyStrideCorrectDto;
@@ -19,6 +23,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 @FeignClient(contextId = "remoterThirdZyService", value = ServiceNameConstants.THIRDPARTY_SERVICE)
 public interface RemoterThirdZyService {
 
@@ -41,28 +47,28 @@ public interface RemoterThirdZyService {
      */
     @NoToken
     @GetMapping("/third-zy-mer/sync-dealer-info")
-    R<ZyMerSyncDealerInfoVo> syncDealerInfo(@RequestBody ZyForeignSyncNativeCardTradeInfoDto dto);
+    R<ZyMerSyncDealerInfoVo> syncDealerInfo(@RequestBody List<ZyMerSyncDealerInfoDto> dto);
 
     /**
      * 记账单位同步
      */
     @NoToken
     @GetMapping("/third-zy-mer/sync-enterprise-info")
-    R<ZyMerSyncEnterpriseInfoVo> syncEnterpriseInfoApi(@RequestBody ZyForeignSyncNativeCardTradeInfoDto dto);
+    R<ZyMerSyncEnterpriseInfoVo> syncEnterpriseInfoApi(@RequestBody List<ZyMerSyncEnterpriseInfoDto> dto);
 
     /**
      * 账户信息同步
      */
     @NoToken
     @GetMapping("/third-zy-mer/sync-account-info")
-    R<ZyMerSyncAccountInfoVo> syncAccountInfoApi(@RequestBody ZyForeignSyncNativeCardTradeInfoDto dto);
+    R<ZyMerSyncAccountInfoVo> syncAccountInfoApi(@RequestBody List<ZyMerSyncAccountInfoDto> dto);
 
     /**
      * 身份信息同步
      */
     @NoToken
     @GetMapping("/third-zy-mer/sync-acc-class-info")
-    R<ZyMerSyncAccClassInfoVo> syncAccClassInfoApi(@RequestBody ZyForeignSyncNativeCardTradeInfoDto dto);
+    R<ZyMerSyncAccClassInfoVo> syncAccClassInfoApi(@RequestBody List<ZyMerSyncAccClassInfoDto> dto);
 
     /* ************************************* end 数据同步 end ************************************* */
 

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/ThirdZyBizEnumType.java

@@ -15,7 +15,7 @@ public enum ThirdZyBizEnumType {
 
     // 数据同步
     SYNC_DEALER_INFO("10", "商户信息同步"),
-    SYNC_ENTERPRISE_INFO("20", "已打印"),
+    SYNC_ENTERPRISE_INFO("20", "记账单位同步"),
     SYNC_ACCOUNT_INFO("30", "账户信息同步"),
     SYNC_ACC_CLASS_INFO("40", "身份信息同步"),
 

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/zy/mer/ZyMerSyncAccountInfoDto.java

@@ -37,7 +37,7 @@ public class ZyMerSyncAccountInfoDto {
     /**
      * 卡片状态，0销卡；1有效；2挂失；3冻结；4预销卡；5锁卡，默认1
      */
-    private String CardStatus;
+    private Integer CardStatus;
 
     /**
      * 该卡在所属接入系统中的所属单位编号

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/zy/mer/ZyMerSyncEnterpriseInfoDto.java

@@ -27,7 +27,7 @@ public class ZyMerSyncEnterpriseInfoDto {
     /**
      * 记账单位是否有效0：禁用 1：有效
      */
-    private String IsValid;
+    private Integer IsValid;
 
     /**
      * 每次推送版本号，格式化为14位字符串，如果是数字不足14位的，前面补0。