diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index bf3045339..4d136a394 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -44,6 +44,7 @@ CREATE TABLE mch_manage phone varchar(128) DEFAULT '' COMMENT '商户手机号', job_time varchar(256) DEFAULT NULL COMMENT '商户营业时间', address_des varchar(256) DEFAULT NULL COMMENT '商户地址', + sort 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 '修改人', diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java index bd60355ac..c06b25735 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java @@ -162,8 +162,6 @@ public class HardOrderController { PjcloudUser user = SecurityUtils.getUser(); CurrentUserHardTypeInfoDto hardTypeInfo = hardManagerService.getCurrentUserHardTypeInfo(user); dto.setMchTypeCodes(hardTypeInfo.getHardTypeList()); - // List mchIds = hardManagerService.getCurrentUserMchInfo(user, dto.getMchIds()); - // dto.setMchIds(mchIds); return R.ok(hardwareOrderService.scopePageList(page, dto, dataScope)); } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java index d31861d0d..2519afbad 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java @@ -1,16 +1,13 @@ 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; /** * 商户管理 @@ -115,6 +112,12 @@ public class MchManageEntity extends Model { @Schema(description = "创建人") private String createBy; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** * 创建时间 */ diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java index 3090efb03..3e99202b1 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java @@ -27,6 +27,7 @@ public interface MchManageMapper extends PjcloudBaseMapper { .likeIfExists(MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) .apply(ObjectUtil.isNotEmpty(dto.getType()), "FIND_IN_SET({0}, types)", dto.getType()) + .orderByDesc(MchManageEntity::getSort) .orderByDesc(MchManageEntity::getCreateTime) .orderByDesc(MchManageEntity::getId); return selectJoinPage(page, MchManageVo.class, wrapper); @@ -49,6 +50,7 @@ public interface MchManageMapper extends PjcloudBaseMapper { .likeIfExists(MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()) + .orderByDesc(MchManageEntity::getSort) .orderByDesc(MchManageEntity::getCreateTime) .orderByDesc(MchManageEntity::getId); return selectJoinList(MchManageVo.class, wrapper); @@ -63,6 +65,7 @@ public interface MchManageMapper extends PjcloudBaseMapper { .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()) + .orderByDesc(MchManageEntity::getSort) .orderByDesc(MchManageEntity::getDeptId) .orderByDesc(MchManageEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); @@ -75,6 +78,7 @@ public interface MchManageMapper extends PjcloudBaseMapper { .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()) + .orderByDesc(MchManageEntity::getSort) .orderByDesc(MchManageEntity::getCreateTime) .orderByDesc(MchManageEntity::getId); return selectListByScope(wrapper, DataScope.of());