zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:商户排序

Browse Source
This commit is contained in:
dzc committed 2025-03-27 18:23:40 +08:00
1 parent e6de7dd2ae
commit cf440bf806
4 files changed
+11 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

db/800pjcloudx_wallet.sql
+1
View File
@@ -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 '修改人',
pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
-2
View File
@@ -162,8 +162,6 @@ public class HardOrderController {
PjcloudUser user = SecurityUtils.getUser();
CurrentUserHardTypeInfoDto hardTypeInfo = hardManagerService.getCurrentUserHardTypeInfo(user);
dto.setMchTypeCodes(hardTypeInfo.getHardTypeList());
// List<Long> mchIds = hardManagerService.getCurrentUserMchInfo(user, dto.getMchIds());
// dto.setMchIds(mchIds);
return R.ok(hardwareOrderService.scopePageList(page, dto, dataScope));
}
pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java
+6 -3
View File
@@ -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<MchManageEntity> {
@Schema(description = "创建人")
private String createBy;
/**
* 排序
*/
@Schema(description = "排序")
private Long sort;
/**
* 创建时间
*/
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java
+4
View File
@@ -27,6 +27,7 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
.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<MchManageEntity> {
.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<MchManageEntity> {
.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<MchManageEntity> {
.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());