feaet:充值同步到正元

2025-03-29 10:38:47 +08:00
1 parent a1c8527a3a
commit ffee069910
@@ -0,0 +1,30 @@
+package com.bsd.pjcloud.wallet.api.constant.mch;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 合作商家类型
+ */
+@Getter
+@AllArgsConstructor
+public enum WalletMchSupType {
+
+    BRAND("10", "品牌"),
+    MCH("20", "商家"),
+    ;
+
+    private final String code;
+    private final String desc;
+
+    public static WalletMchSupType valueOfByType(String code) {
+        return Arrays.stream(WalletMchSupType.values())
+                .filter(v -> ObjectUtil.equal(v.getCode(), code))
+                .findFirst().get();
+    }
+
+}
@@ -1,6 +1,6 @@
 package com.bsd.pjcloud.wallet.api.dto;

-import com.bsd.pjcloud.wallet.api.entity.MchManageEntity;
+import com.bsd.pjcloud.wallet.api.entity.mch.MchManageEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,4 +20,5 @@ public class MchManageDto extends MchManageEntity {

    private String type;

+    private Boolean parentIsNull = true;
 }
@@ -0,0 +1,26 @@
+package com.bsd.pjcloud.wallet.api.dto.mch;
+
+import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MchDeptDto extends MchDeptEntity {
+
+    private List<Long> mchIds;
+
+    private List<Long> dpetIds;
+
+    /**
+     * 商户名
+     */
+    private String merchantName;
+
+}
@@ -1,9 +0,0 @@
-package com.bsd.pjcloud.wallet.api.dto.mch;
-
-import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptUserEntity;
-import lombok.Data;
-
-@Data
-public class MchDeptUserDto extends MchDeptUserEntity {
-
-}
@@ -0,0 +1,9 @@
+package com.bsd.pjcloud.wallet.api.dto.mch;
+
+import com.bsd.pjcloud.wallet.api.entity.mch.MchRuleJoinDtoEntity;
+import lombok.Data;
+
+@Data
+public class MchRuleJoinDto extends MchRuleJoinDtoEntity {
+
+}
@@ -0,0 +1,9 @@
+package com.bsd.pjcloud.wallet.api.dto.mch;
+
+import com.bsd.pjcloud.wallet.api.entity.mch.MchRulePriceConfigEntity;
+import lombok.Data;
+
+@Data
+public class MchRulePriceConfigDto extends MchRulePriceConfigEntity {
+    
+}
@@ -1,8 +0,0 @@
-package com.bsd.pjcloud.wallet.api.dto.rule;
-
-import com.bsd.pjcloud.wallet.api.entity.rule.WalletRuleMchConfigEntity;
-import lombok.Data;
-
-@Data
-public class WalletRuleMchConfigDto extends WalletRuleMchConfigEntity {
-}
@@ -1,8 +0,0 @@
-package com.bsd.pjcloud.wallet.api.dto.rule;
-
-import com.bsd.pjcloud.wallet.api.entity.rule.WalletRulePriceConfigEntity;
-import lombok.Data;
-
-@Data
-public class WalletRulePriceConfigDto extends WalletRulePriceConfigEntity {
-}
@@ -0,0 +1,83 @@
+package com.bsd.pjcloud.wallet.api.entity.mch;
+
+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;
+
+/**
+ * 用户部门商户关系表
+ */
+@Data
+@TenantTable
+@TableName("mch_dept")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "部门商户关系表")
+public class MchDeptEntity extends Model<MchDeptEntity> {
+
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private Long id;
+
+    /**
+     * 商户id
+     */
+    @Schema(description = "商户id")
+    private Long mchId;
+
+    /**
+     * 部门id
+     */
+    @Schema(description = "部门id")
+    private Long deptId;
+
+    /**
+     * 创建人
+     */
+    @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;
+
+    /**
+     * 租户ID
+     */
+    @Schema(description = "租户ID")
+    private Long tenantId;
+}
@@ -1,91 +0,0 @@
-package com.bsd.pjcloud.wallet.api.entity.mch;
-
-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;
-
-/**
- * 用户部门商户关系表
- *
- * @author pjcloud
- * @date 2025-03-28 15:28:00
- */
-@Data
-@TenantTable
-@TableName("mch_dept_user")
-@EqualsAndHashCode(callSuper = true)
-@Schema(description = "用户部门商户关系表")
-public class MchDeptUserEntity extends Model<MchDeptUserEntity> {
-
-
-	/**
-	* 主键
-	*/
-    @TableId(type = IdType.ASSIGN_ID)
-    @Schema(description="主键")
-    private Long id;
-
-	/**
-	* 商户id
-	*/
-    @Schema(description="商户id")
-    private Long mchId;
-
-	/**
-	* 用户id
-	*/
-    @Schema(description="用户id")
-    private Long userId;
-
-	/**
-	* 用户部门id
-	*/
-    @Schema(description="用户部门id")
-    private Long userDeptId;
-
-	/**
-	* 创建人
-	*/
-	@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;
-
-	/**
-	* 租户ID
-	*/
-    @Schema(description="租户ID")
-    private Long tenantId;
-}
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.wallet.api.entity;
+package com.bsd.pjcloud.wallet.api.entity.mch;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -117,13 +117,19 @@ public class MchManageEntity extends Model<MchManageEntity> {
    @TableField(fill = FieldFill.INSERT)
    @Schema(description = "创建人")
    private String createBy;
-
    /**
     * 排序
     */
    @Schema(description = "排序")
    private Long sort;

+    /**
+     * 创建人
+     */
+    @Schema(description = "超市类型")
+    private String supType;
+
+
    /**
     * 优惠价格(没实际作用)
     */
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.wallet.api.entity.rule;
+package com.bsd.pjcloud.wallet.api.entity.mch;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -9,18 +9,12 @@ import com.bsd.pjcloud.common.core.util.TenantTable;

 import java.time.LocalDateTime;

-/**
- * 商户规格配置表
- *
- * @author pjcloud
- * @date 2025-03-26 11:14:39
- */
@Data
@TenantTable
-@TableName("wallet_rule_mch_config")
+@TableName("mch_rule_join")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "商户规格配置表")
-public class WalletRuleMchConfigEntity extends Model<WalletRuleMchConfigEntity> {
+public class MchRuleJoinDtoEntity extends Model<MchRuleJoinDtoEntity> {


    /**
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.wallet.api.entity.rule;
+package com.bsd.pjcloud.wallet.api.entity.mch;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -9,14 +9,12 @@ import com.bsd.pjcloud.common.core.util.TenantTable;

 import java.time.LocalDateTime;

-
@Data
@TenantTable
-@TableName("wallet_rule_price_config")
+@TableName("mch_rule_price_config")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "钱包规则")
-public class WalletRulePriceConfigEntity extends Model<WalletRulePriceConfigEntity> {
-
+public class MchRulePriceConfigEntity extends Model<MchRulePriceConfigEntity> {

    /**
     * 主键
@@ -1,10 +1,11 @@
 package com.bsd.pjcloud.wallet.api.vo;

 import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
-import com.bsd.pjcloud.wallet.api.entity.MchManageEntity;
+import com.bsd.pjcloud.wallet.api.entity.mch.MchManageEntity;
 import com.bsd.pjcloud.wallet.api.vo.base.BaseWalletTypeInterface;
 import lombok.Data;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+
+import java.util.List;

@Data
 public class MchManageVo extends MchManageEntity implements BaseDeptInterface, BaseWalletTypeInterface {
@@ -19,4 +20,6 @@ public class MchManageVo extends MchManageEntity implements BaseDeptInterface, B

    private String walletTypeIcon;

+    private List<MchManageVo> children;
+
 }
@@ -1,9 +0,0 @@
-package com.bsd.pjcloud.wallet.api.vo.mch;
-
-import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptUserEntity;
-import lombok.Data;
-
-@Data
-public class MchDeptUserVo extends MchDeptUserEntity {
-
-}
@@ -0,0 +1,25 @@
+package com.bsd.pjcloud.wallet.api.vo.mch;
+
+import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
+import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptEntity;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
+import lombok.Data;
+
+@Data
+public class MchDeptVo extends MchDeptEntity implements BaseMchInterface, BaseDeptInterface {
+
+    /**
+     * 商户相关
+     */
+    private Long merchantId;
+
+    private String merchantName;
+
+    private String logoPic;
+
+    /**
+     * 部门相关
+     */
+    private String deptName;
+
+}
@@ -1,10 +1,10 @@
-package com.bsd.pjcloud.wallet.api.vo.rule;
+package com.bsd.pjcloud.wallet.api.vo.mch;

-import com.bsd.pjcloud.wallet.api.entity.rule.WalletRuleMchConfigEntity;
+import com.bsd.pjcloud.wallet.api.entity.mch.MchRuleJoinDtoEntity;
 import lombok.Data;

@Data
-public class WalletRuleMchConfigVo extends WalletRuleMchConfigEntity {
+public class MchRuleJoinDtoVo extends MchRuleJoinDtoEntity {

    /**
     * 钱包规则id
@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.wallet.api.vo.mch;
+
+import com.bsd.pjcloud.wallet.api.entity.mch.MchRulePriceConfigEntity;
+import lombok.Data;
+
+@Data
+public class MchRulePriceConfigVo extends MchRulePriceConfigEntity {
+}
@@ -1,8 +0,0 @@
-package com.bsd.pjcloud.wallet.api.vo.rule;
-
-import com.bsd.pjcloud.wallet.api.entity.rule.WalletRulePriceConfigEntity;
-import lombok.Data;
-
-@Data
-public class WalletRulePriceConfigVo extends WalletRulePriceConfigEntity {
-}