Merge remote-tracking branch 'origin/master'

db/800pjcloudx_wallet.sql

@@ -33,6 +33,7 @@ DROP TABLE IF EXISTS `mch_manage`;
 CREATE TABLE mch_manage
 (
     id                     bigint       NOT NULL COMMENT '主键',
+    parent_id              bigint       NOT NULL COMMENT '主键',
     dept_id                bigint       NOT NULL COMMENT '绑定的部门id',
     default_wallet_type_id bigint                                 DEFAULT NULL COMMENT '商户默认使用的钱包类型',
     hard_group_id          bigint COMMENT '设备分组id',
@@ -45,6 +46,9 @@ CREATE TABLE mch_manage
     job_time               varchar(256)                           DEFAULT NULL COMMENT '商户营业时间',
     address_des            varchar(256)                           DEFAULT NULL COMMENT '商户地址',
     sort                   int          NOT NULL COMMENT '排序',
+    discounts_price        varchar(256) NOT NULL COMMENT '优惠价格(没实际作用)',
+    cooperation_status     varchar(64)  NOT NULL COMMENT '合作状态',
+    mch_count              int          NOT NULL COMMENT '分店数量',
     create_by              varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
     create_time            datetime                               DEFAULT NULL COMMENT '创建时间',
     update_by              varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
@@ -57,6 +61,27 @@ CREATE TABLE mch_manage
   COLLATE = utf8mb4_general_ci COMMENT ='商户管理';
 CREATE INDEX idx_dept_id ON mch_manage (dept_id);
 
+-- ----------------------------
+-- Table structure for mch_dpet_user
+-- ----------------------------
+DROP TABLE IF EXISTS `mch_dept_user`;
+CREATE TABLE mch_dept_user
+(
+    id           bigint NOT NULL COMMENT '主键',
+    mch_id       bigint NOT NULL COMMENT '商户id',
+    user_id      bigint NOT NULL COMMENT '用户id',
+    user_dept_id bigint NOT NULL COMMENT '用户部门id',
+    create_by    varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    create_time  datetime                               DEFAULT NULL COMMENT '创建时间',
+    update_by    varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
+    update_time  datetime                               DEFAULT NULL COMMENT '修改时间',
+    del_flag     char(1) COLLATE utf8mb4_general_ci     DEFAULT '0' COMMENT '删除标记',
+    tenant_id    bigint                                 DEFAULT NULL COMMENT '租户ID',
+    PRIMARY KEY (id)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='用户部门商户关系表';
+
 -- ----------------------------
 -- Table structure for wallet_manage
 -- ----------------------------

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

@@ -30,6 +30,12 @@ public class MchManageEntity extends Model<MchManageEntity> {
     @Schema(description = "主键")
     private Long id;
 
+    /**
+     * 父商家id
+     */
+    @Schema(description = "父商家id")
+    private Long parentId;
+
     /**
      * 绑定的部门id - 商户的部门id
      */
@@ -118,6 +124,24 @@ public class MchManageEntity extends Model<MchManageEntity> {
     @Schema(description = "排序")
     private Long sort;
 
+    /**
+     * 优惠价格(没实际作用)
+     */
+    @Schema(description = "优惠价格(没实际作用)")
+    private String discountsPrice;
+
+    /**
+     * 合作状态
+     */
+    @Schema(description = "合作状态")
+    private String cooperationStatus;
+
+    /**
+     * 分店数量
+     */
+    @Schema(description = "分店数量")
+    private Long mchCount;
+
     /**
      * 创建时间
      */

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java

@@ -61,7 +61,7 @@ public class MchManageController {
 
     @Inner
     @GetMapping("/get-by-dept-id")
-    public R<MchManageVo> getByDeptId(@RequestParam("deptId") Long deptId,  MerchantTypeEnum type) {
+    public R<MchManageVo> getByDeptId(@RequestParam("deptId") Long deptId, MerchantTypeEnum type) {
         MchManageVo mchManage = mchManageService.getByDeptId(deptId, type);
         if (ObjectUtil.isEmpty(mchManage)) return R.failed("商户不存在");
         return R.ok(mchManage);

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java

@@ -60,6 +60,12 @@ public interface WalletRechargeApplyMapper extends PjcloudBaseMapper<WalletRecha
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[0] : null,
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[1] : null
                 )
+                .between(
+                        ObjectUtil.isNotEmpty(dto.getProcessTimeList()),
+                        WalletRechargeApplyEntity::getProcessTime,
+                        ObjectUtil.isNotEmpty(dto.getProcessTimeList()) ? dto.getProcessTimeList()[0] : null,
+                        ObjectUtil.isNotEmpty(dto.getProcessTimeList()) ? dto.getProcessTimeList()[1] : null
+                )
                 .orderByDesc(WalletRechargeApplyEntity::getCreateTime)
                 .orderByDesc(WalletRechargeApplyEntity::getId);
         Page list = selectPageByScope(page, wrapper, DataScope.of());