feat:商户结账完成

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

@@ -3,6 +3,14 @@ package com.bsd.pjcloud.wallet.api.dto.mch;
 import com.bsd.pjcloud.wallet.api.entity.mch.MchCheckoutEntity;
 import lombok.Data;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 @Data
 public class MchCheckoutDto extends MchCheckoutEntity {
+
+    private LocalDate[] checkoutTimeList;
+
+    private LocalDate[] createTimeList;
+
 }

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

@@ -24,6 +24,7 @@ public class WalletDataUtil {
         if (ObjectUtil.isEmpty(vo)) return v;
         v.setMerchantName(vo.getName());
         v.setLogoPic(vo.getLogoPic());
+        v.setMerchantType(vo.getTypes());
         return v;
     }
 

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

@@ -43,4 +43,6 @@ public class WalletActiveVo extends WalletActiveEntity implements BaseUserInterf
     private String walletTypeIcon;
 
     private String isRule;
+
+    private String merchantType;
 }

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

@@ -23,5 +23,12 @@ public interface BaseMchInterface {
 
     void setLogoPic(String logoPic);
 
+    /**
+     * 商户类型
+     */
+    String getMerchantType();
+
+    void setMerchantType(String merchantType);
+
 
 }

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

@@ -1,8 +1,41 @@
 package com.bsd.pjcloud.wallet.api.vo.mch;
 
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
 import com.bsd.pjcloud.wallet.api.entity.mch.MchCheckoutEntity;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 @Data
-public class MchCheckoutVo extends MchCheckoutEntity {
+public class MchCheckoutVo extends MchCheckoutEntity implements BaseMchInterface, BaseUserDeptInterface {
+
+    /**
+     * 店铺相关
+     */
+    private Long merchantId;
+
+    private String merchantName;
+
+    private String logoPic;
+
+    /**
+     * 用户部门相关
+     */
+    private Long userId;
+
+    private String username;
+
+    private String userMobile;
+
+    private String userAvatar;
+
+    private Long userDeptId;
+
+    private String userDeptName;
+
+    private String merchantType;
+
+
 }

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

@@ -17,6 +17,8 @@ public class MchDeptVo extends MchDeptEntity implements BaseMchInterface, BaseDe
 
     private String logoPic;
 
+    private String merchantType;
+
     /**
      * 部门相关
      */