del:删除商户服务

creat:新建钱包商户
2025-01-02 12:00:52 +08:00
1 parent da4a59e0ca
commit c086729afb
@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.wallet.api.dto;
+
+import com.bsd.pjcloud.wallet.api.entity.MchManageEntity;
+import lombok.Data;
+
+@Data
+public class MchManageDto extends MchManageEntity {
+}
@@ -0,0 +1,133 @@
+package com.bsd.pjcloud.wallet.api.entity;
+
+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 dzc
+ * @date 2025-01-02 11:09:26
+ */
+@Data
+@TenantTable
+@TableName("mch_manage")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "商户管理")
+public class MchManageEntity extends Model<MchManageEntity> {
+
+
+	/**
+	* 主键
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="主键")
+    private Long id;
+
+	/**
+	* 绑定的部门id
+	*/
+    @Schema(description="绑定的部门id")
+    private Long deptId;
+
+	/**
+	* 商户名
+	*/
+    @Schema(description="商户名")
+    private String name;
+
+	/**
+	* 店铺类型,逗号分隔
+	*/
+    @Schema(description="店铺类型,逗号分隔")
+    private String types;
+
+	/**
+	* 商户logo图片
+	*/
+    @Schema(description="商户logo图片")
+    private String logoPic;
+
+	/**
+	* 商户收款码,自动生成
+	*/
+    @Schema(description="商户收款码,自动生成")
+    private String collectionCode;
+
+	/**
+	* 商户轮播图,逗号分隔
+	*/
+    @Schema(description="商户轮播图,逗号分隔")
+    private String swiperPic;
+
+	/**
+	* 商户手机号
+	*/
+    @Schema(description="商户手机号")
+    private String phone;
+
+	/**
+	* 商户开始营业时间
+	*/
+    @Schema(description="商户开始营业时间")
+    private LocalDateTime jobStartTime;
+
+	/**
+	* 商户结束营业时间
+	*/
+    @Schema(description="商户结束营业时间")
+    private LocalDateTime jobEndTime;
+
+	/**
+	* 商户地址
+	*/
+    @Schema(description="商户地址")
+    private String addressDes;
+
+	/**
+	* 创建人
+	*/
+	@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;
+}
@@ -0,0 +1,29 @@
+package com.bsd.pjcloud.wallet.api.feign;
+
+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.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(contextId = "remoteMchService", value = ServiceNameConstants.WALLET_SERVICE)
+public interface RemoteMchService {
+
+    @NoToken
+    @GetMapping("/get-by-id")
+    R<MchManageDto> getById(@RequestParam Long id);
+
+    @NoToken
+    @GetMapping("/get-by-dept-id")
+    R<MchManageDto> getByDeptId(@RequestParam Long deptId);
+
+    @NoToken
+    @GetMapping("/get-first-mch")
+    R<MchManageDto> getFirstMch(@RequestParam List<Long> deptIds);
+
+}
@@ -7,7 +7,6 @@ import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;

 import java.util.List;
@@ -0,0 +1,12 @@
+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 lombok.Data;
+
+@Data
+public class MchManageVo extends MchManageEntity implements BaseDeptInterface {
+
+    private String deptName;
+
+}
@@ -0,0 +1,23 @@
+package com.bsd.pjcloud.wallet.api.vo.code;
+
+import lombok.Data;
+
+@Data
+public class MchCollectionCodeVo {
+    /**
+     * 商户Id
+     */
+    private Long id;
+    /**
+     * 商户名
+     */
+    private String name;
+    /**
+     * 商户类型
+     */
+    private String type;
+
+    public String getFileName() {
+        return "merchant_collect_money_code_" + id;
+    }
+}
@@ -1 +1,2 @@
-com.bsd.pjcloud.wallet.api.feign.RemoteWalletService
+com.bsd.pjcloud.wallet.api.feign.RemoteWalletService
+com.bsd.pjcloud.wallet.api.feign.RemoteMchService