create:钱包开卡完成

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/MchManageDto.java

@@ -16,4 +16,6 @@ public class MchManageDto extends MchManageEntity {
 
     private List<Long> deptIds;
 
+    private List<Long> ids;
+
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletActiveDto.java

@@ -7,6 +7,8 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class WalletActiveDto extends WalletActiveEntity {
 
@@ -19,7 +21,7 @@ public class WalletActiveDto extends WalletActiveEntity {
     @NotNull(message = "商户id不能为空")
     private Long merchantId;
 
-    @NotNull(message = "钱包类型id不能为空")
     private Long walletTypeId;
 
+    private List<Long> userIds;
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java

@@ -1,12 +1,15 @@
 package com.bsd.pjcloud.wallet.api.entity;
 
+import cn.hutool.core.date.DatePattern;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 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;
+import java.time.LocalTime;
 
 /**
  * 商户管理
@@ -75,13 +78,15 @@ public class MchManageEntity extends Model<MchManageEntity> {
 	* 商户开始营业时间
 	*/
     @Schema(description="商户开始营业时间")
-    private LocalDateTime jobStartTime;
+	@JsonFormat(pattern = DatePattern.NORM_TIME_PATTERN)
+    private LocalTime jobStartTime;
 
 	/**
 	* 商户结束营业时间
 	*/
     @Schema(description="商户结束营业时间")
-    private LocalDateTime jobEndTime;
+	@JsonFormat(pattern = DatePattern.NORM_TIME_PATTERN)
+    private LocalTime jobEndTime;
 
 	/**
 	* 商户地址

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/utils/MchDataUtil.java

@@ -15,12 +15,12 @@ import java.util.Map;
 public class MchDataUtil {
 
     public <T extends BaseMchInterface> List<T> convertMchList(List<T> list, Map<Long, MchManageVo> map) {
-        return CollectionUtils.convertList(list, v -> convertMch(v, map.get(v.getMchId())));
+        return CollectionUtils.convertList(list, v -> convertMch(v, map.get(v.getMerchantId())));
     }
 
     public <T extends BaseMchInterface> T convertMch(T v, MchManageVo vo) {
         if (ObjectUtil.isEmpty(vo)) return v;
-        v.setMchName(vo.getName());
+        v.setMerchantName(vo.getName());
         return v;
     }
 

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletActiveVo.java

@@ -1,8 +1,30 @@
 package com.bsd.pjcloud.wallet.api.vo;
 
+import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
 import com.bsd.pjcloud.wallet.api.entity.WalletActiveEntity;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;
 
+
 @Data
-public class WalletActiveVo extends WalletActiveEntity {
+public class WalletActiveVo extends WalletActiveEntity implements BaseUserInterface, BaseDeptInterface, BaseMchInterface {
+    /**
+     * 用户相关
+     */
+    private String username;
+
+    private String userMobile;
+
+    private String userAvatar;
+
+    /**
+     * 部门相关
+     */
+    private String deptName;
+
+    /**
+     * 商户相关
+     */
+    private String merchantName;
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/base/BaseMchInterface.java

@@ -5,15 +5,15 @@ public interface BaseMchInterface {
     /**
      * 商户id
      */
-    Long getMchId();
+    Long getMerchantId();
 
-    void setMchId(Long dchId);
+    void setMerchantId(Long dchId);
 
     /**
      * 商户名
      */
-    String getMchName();
+    String getMerchantName();
 
-    void setMchName(String dchName);
+    void setMerchantName(String dchName);
 
 }