diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index 08ceb1c8e..378dc1e2c 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -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 = '商户规格配置表'; diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java index 7b4d70e54..8d913d157 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java @@ -25,6 +25,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn private List hardTypeCodes; + private String hardTypeCode; + private List mchIds; private List orderStatusCodes; diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index ca962349a..a20d094ff 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -165,8 +165,11 @@ left join hard_manager m on m.id = a.hard_id + + and m.type = #{dto.hardTypeCode} + - and m.unique_code in + and m.type in #{v} @@ -187,7 +190,7 @@ - and m.unique_code in + and m.type in #{v} @@ -206,7 +209,7 @@ - and m.unique_code in + and m.type in #{v} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java index 71819f330..62551ae1f 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java @@ -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;