feat:正元同步交易数据、用户信息、修改用户钱包状态

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

@@ -62,7 +62,7 @@ public interface RemoterThirdZyService {
      */
     @NoToken
     @PostMapping("/third-zy-mer/sync-account-info")
-    R<ZyMerSyncAccountInfoVo> syncAccountInfoApi(@RequestBody List<ZyMerSyncAccountInfoDto> dto);
+    R<ZyMerSyncAccountInfoVo.DataVo> syncAccountInfoApi(@RequestBody List<ZyMerSyncAccountInfoDto> dto);
 
     /**
      * 身份信息同步

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/zy/foreign/ZyForeignSyncNativeCardTradeInfoDto.java

@@ -24,7 +24,7 @@ public class ZyForeignSyncNativeCardTradeInfoDto {
     /**
      * 就餐总人数，从推广公务餐之日起，即总人数
      */
-    private Long totalNum = 0L;
+    private Long totalNum;
 
     /**
      * 就餐总金额，从推广公务餐之日起，即总金额
@@ -44,7 +44,7 @@ public class ZyForeignSyncNativeCardTradeInfoDto {
     /**
      * 当月就餐总人数，从当月1日开始
      */
-    private Long totalNumMonth = 0L;
+    private Long totalNumMonth;
 
     /**
      * 当月就餐总金额，从当月1日开始
@@ -54,7 +54,7 @@ public class ZyForeignSyncNativeCardTradeInfoDto {
     /**
      * 当日就餐总人数
      */
-    private Long totalNumDay = 0L;
+    private Long totalNumDay;
 
     /**
      * 当日就餐总金额

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/zy/ZyBaseEncryptVo.java

@@ -1,6 +1,8 @@
 package com.bsd.pjcloud.thirdparty.vo.zy;
 
 import lombok.Data;
+import cn.hutool.core.codec.Base64;
+
 
 @Data
 public class ZyBaseEncryptVo {
@@ -14,4 +16,8 @@ public class ZyBaseEncryptVo {
     public boolean isSuccess() {
         return successCode.equals(code);
     }
+
+    public String getDecodeBase64Data() {
+        return Base64.decodeStr(data);
+    }
 }

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/zy/mer/ZyMerSyncAccountInfoVo.java

@@ -10,7 +10,7 @@ import lombok.Data;
 public class ZyMerSyncAccountInfoVo extends ZyBaseVo {
 
     @Data
-    static  class DataVo{
+    public static class DataVo {
         /**
          * 当前智慧园区通刷服务平台保存的最新同步版本号，返回该版本号，要求第三方一卡通系统同步这个大于这个版本号的数据
          */