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-26 14:47:45 +08:00
1 parent 31760af911
commit 70db17490c
4 files changed
+16 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

db/800pjcloudx_wallet.sql
+4 -2
View File
@@ -101,7 +101,8 @@ CREATE TABLE wallet_rule_price_config
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'
tenant_id bigint DEFAULT NULL COMMENT '租户ID',
PRIMARY KEY (id)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci COMMENT = '商家商品价格配置表';
@@ -120,7 +121,8 @@ CREATE TABLE wallet_rule_mch_config
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'
tenant_id bigint DEFAULT NULL COMMENT '租户ID',
PRIMARY KEY (id)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci COMMENT = '商户规格配置表';
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
+2
View File
@@ -25,6 +25,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
private List<String> hardTypeCodes;
private String hardTypeCode;
private List<Long> mchIds;
private List<String> orderStatusCodes;
pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
+6 -3
View File
@@ -165,8 +165,11 @@
left join hard_manager m on m.id = a.hard_id
<where>
<include refid="whereA"/>
<if test="dto.hardTypeCode != null and dto.hardTypeCode != '' ">
and m.type = #{dto.hardTypeCode}
</if>
<if test="dto.hardTypeCodes != null and dto.hardTypeCodes.size() != 0">
and m.unique_code in
and m.type in
<foreach collection="dto.hardTypeCodes" item="v" open="(" close=")" separator=",">
#{v}
</foreach>
@@ -187,7 +190,7 @@
<where>
<include refid="whereA"/>
<if test="dto.hardTypeCodes != null and dto.hardTypeCodes.size() != 0">
and m.unique_code in
and m.type in
<foreach collection="dto.hardTypeCodes" item="v" open="(" close=")" separator=",">
#{v}
</foreach>
@@ -206,7 +209,7 @@
<where>
<include refid="whereA"/>
<if test="dto.hardTypeCodes != null and dto.hardTypeCodes.size() != 0">
and m.unique_code in
and m.type in
<foreach collection="dto.hardTypeCodes" item="v" open="(" close=")" separator=",">
#{v}
</foreach>
pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java
+4 -1
View File
@@ -6,11 +6,14 @@ import lombok.Getter;
import java.util.Arrays;
/**
* 钱包规则
*/
@Getter
@AllArgsConstructor
public enum WalletRulePriceTypeEnum {
STRIDE_LIMIT("10", "跨单位额外支付"),
EVERY_LIMIT("20", "每餐额度额外支付"),
EVERY_LIMIT("20", "每餐额外支付"),
;
private final String code;