feat:正元同步部门、身份、商户信息、自动创建并且绑定饭卡、正元id字典
This commit is contained in:
1 parent
54a46dd9ee
commit
4382c13d8a
30 files changed
+710
-171
No files matched your search
+9
-8
@@ -21,6 +21,7 @@ import com.bsd.pjcloud.thirdparty.vo.zy.stride.ZyStrideConsumptionVo;
|
||||
import com.bsd.pjcloud.thirdparty.vo.zy.stride.ZyStrideCorrectVo;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
|
||||
import java.util.List;
|
||||
@@ -34,7 +35,7 @@ public interface RemoterThirdZyService {
|
||||
* 本地一卡通交易数据同步
|
||||
*/
|
||||
@NoToken
|
||||
@GetMapping("/third-zy-foreign/sync-native-card")
|
||||
@PostMapping("/third-zy-foreign/sync-native-card")
|
||||
R<ZyForeignSyncNativeCardTradeInfoVo> syncNativeCardTradeInfoApi(@RequestBody ZyForeignSyncNativeCardTradeInfoDto dto);
|
||||
|
||||
/* ************************************* end 正元本地一卡通交易数据同步 end ************************************* */
|
||||
@@ -46,28 +47,28 @@ public interface RemoterThirdZyService {
|
||||
* 商户信息同步
|
||||
*/
|
||||
@NoToken
|
||||
@GetMapping("/third-zy-mer/sync-dealer-info")
|
||||
@PostMapping("/third-zy-mer/sync-dealer-info")
|
||||
R<ZyMerSyncDealerInfoVo> syncDealerInfo(@RequestBody List<ZyMerSyncDealerInfoDto> dto);
|
||||
|
||||
/**
|
||||
* 记账单位同步
|
||||
*/
|
||||
@NoToken
|
||||
@GetMapping("/third-zy-mer/sync-enterprise-info")
|
||||
@PostMapping("/third-zy-mer/sync-enterprise-info")
|
||||
R<ZyMerSyncEnterpriseInfoVo> syncEnterpriseInfoApi(@RequestBody List<ZyMerSyncEnterpriseInfoDto> dto);
|
||||
|
||||
/**
|
||||
* 账户信息同步
|
||||
*/
|
||||
@NoToken
|
||||
@GetMapping("/third-zy-mer/sync-account-info")
|
||||
@PostMapping("/third-zy-mer/sync-account-info")
|
||||
R<ZyMerSyncAccountInfoVo> syncAccountInfoApi(@RequestBody List<ZyMerSyncAccountInfoDto> dto);
|
||||
|
||||
/**
|
||||
* 身份信息同步
|
||||
*/
|
||||
@NoToken
|
||||
@GetMapping("/third-zy-mer/sync-acc-class-info")
|
||||
@PostMapping("/third-zy-mer/sync-acc-class-info")
|
||||
R<ZyMerSyncAccClassInfoVo> syncAccClassInfoApi(@RequestBody List<ZyMerSyncAccClassInfoDto> dto);
|
||||
|
||||
/* ************************************* end 数据同步 end ************************************* */
|
||||
@@ -78,21 +79,21 @@ public interface RemoterThirdZyService {
|
||||
* 统一身份验证功能
|
||||
*/
|
||||
@NoToken
|
||||
@GetMapping("/third-zy-stride/authentication")
|
||||
@PostMapping("/third-zy-stride/authentication")
|
||||
R<ZyStrideAuthenticationVo> authenticationApi(@RequestBody ZyStrideAuthenticationDto dto);
|
||||
|
||||
/**
|
||||
* 智慧园区通刷平台提供消费接口
|
||||
*/
|
||||
@NoToken
|
||||
@GetMapping("/third-zy-stride/consumption")
|
||||
@PostMapping("/third-zy-stride/consumption")
|
||||
R<ZyStrideConsumptionVo> consumptionApi(@RequestBody ZyStrideConsumptionDto dto);
|
||||
|
||||
/**
|
||||
* 智慧园区通刷平台提供冲正接口
|
||||
*/
|
||||
@NoToken
|
||||
@GetMapping("/third-zy-stride/correct")
|
||||
@PostMapping("/third-zy-stride/correct")
|
||||
R<ZyStrideCorrectVo> correctApi(@RequestBody ZyStrideCorrectDto dto);
|
||||
|
||||
/* ************************************* end 数据同步 end ************************************* */
|
||||
|
||||
+5
-5
@@ -24,17 +24,17 @@ public class ZyForeignSyncNativeCardTradeInfoDto {
|
||||
/**
|
||||
* 就餐总人数,从推广公务餐之日起,即总人数
|
||||
*/
|
||||
private Long totalNum;
|
||||
private Long totalNum = 0L;
|
||||
|
||||
/**
|
||||
* 就餐总金额,从推广公务餐之日起,即总金额
|
||||
* 就餐总金额,从推广公务餐之日起,即总金额
|
||||
*/
|
||||
private BigDecimal totalMoney;
|
||||
|
||||
/**
|
||||
* 当年就餐总人数,从当年1月1日开始
|
||||
*/
|
||||
private Long totalNumYear;
|
||||
private Long totalNumYear = 0L;
|
||||
|
||||
/**
|
||||
* 当年就餐总金额,从当年1月1日开始
|
||||
@@ -44,7 +44,7 @@ public class ZyForeignSyncNativeCardTradeInfoDto {
|
||||
/**
|
||||
* 当月就餐总人数,从当月1日开始
|
||||
*/
|
||||
private Long totalNumMonth;
|
||||
private Long totalNumMonth = 0L;
|
||||
|
||||
/**
|
||||
* 当月就餐总金额,从当月1日开始
|
||||
@@ -54,7 +54,7 @@ public class ZyForeignSyncNativeCardTradeInfoDto {
|
||||
/**
|
||||
* 当日就餐总人数
|
||||
*/
|
||||
private Long totalNumDay;
|
||||
private Long totalNumDay = 0L;
|
||||
|
||||
/**
|
||||
* 当日就餐总金额
|
||||
|
||||
+92
@@ -0,0 +1,92 @@
|
||||
package com.bsd.pjcloud.thirdparty.entity.zy;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 正元字典id对应 id + bizType 唯一
|
||||
*
|
||||
* @author third
|
||||
* @date 2025-03-04 19:11:02
|
||||
*/
|
||||
@Data
|
||||
@TenantTable
|
||||
@TableName("third_zy_id_dict")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "正元字典id对应 id + bizType 唯一")
|
||||
public class ThirdZyIdDictEntity extends Model<ThirdZyIdDictEntity> {
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 自己这边的id映射
|
||||
*/
|
||||
@Schema(description = "自己这边的id映射")
|
||||
private String selfId;
|
||||
|
||||
/**
|
||||
* 正元id映射
|
||||
*/
|
||||
@Schema(description = "正元id映射")
|
||||
private String zyId;
|
||||
|
||||
/**
|
||||
* 同步类型
|
||||
*/
|
||||
@Schema(description = "同步类型")
|
||||
private String bizType;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "更新时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 删除时间
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "删除时间")
|
||||
private String delFlag;
|
||||
|
||||
/**
|
||||
* tenantId
|
||||
*/
|
||||
@Schema(description = "tenantId")
|
||||
private Long tenantId;
|
||||
}
|
||||
Reference in new issue
Block a user