From 8fd05c6fd4b970cd86ec2341d1bd39e20ecc407f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Feb 2023 11:08:57 +0800
Subject: [PATCH] prod参数修改
---
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java | 16 ++++++++
src/main/resources/mapper/modules/MallGoodsMapper.xml | 8 ++++
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java | 18 ++++++++
src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java | 10 ++--
src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java | 2
src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java | 2
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2
src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java | 8 ++--
src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java | 2
9 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 1d08982..219705f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -126,7 +126,7 @@
orderInfo.setOrderType(addOrderDto.getOrderType());
// orderInfo.setTakeUniqueCode(addOrderDto.getTakeUniqueCode());
- orderInfo.setDeliveryType(1);
+ orderInfo.setDeliveryType(2);
if (CollUtil.isEmpty(addOrderDto.getItems())) {
throw new FebsException("参数错误");
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
index 25eebaa..53362d9 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
@@ -71,4 +71,20 @@
@ApiModelProperty(value = "评论数量")
private Integer commentCount;
+ //运费方式 （1：固定运费 2：运费模板）
+
+ @ApiModelProperty(value = "运费方式 （1：固定运费 2：运费模板）")
+ private Integer carriageType;
+ //运费金额
+
+ @ApiModelProperty(value = "固定运费金额")
+ private BigDecimal carriageAmount;
+ //运费模板ID
+
+ @ApiModelProperty(value = "运费模板ID")
+ private Long carriageRuleId;
+ //重量
+
+ @ApiModelProperty(value = "重量")
+ private BigDecimal goodsWeight;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
index 2d19c5e..d332242 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
@@ -44,6 +44,22 @@
@ApiModelProperty(value = "积分")
private BigDecimal score;
- @ApiModelProperty(value = "是否有运费 1-是 2-包邮")
+ @ApiModelProperty(value = "是否有运费 1-是 2-包邮 （不使用了）")
private Integer hasCarriage;
+ //运费方式 （1：固定运费 2：运费模板）
+
+ @ApiModelProperty(value = "运费方式 （1：固定运费 2：运费模板）")
+ private Integer carriageType;
+ //运费金额
+
+ @ApiModelProperty(value = "固定运费金额")
+ private BigDecimal carriageAmount;
+ //运费模板ID
+
+ @ApiModelProperty(value = "运费模板ID")
+ private Long carriageRuleId;
+ //重量
+
+ @ApiModelProperty(value = "重量")
+ private BigDecimal goodsWeight;
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java
index aec9654..e4b4676 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java
@@ -6,5 +6,5 @@
**/
public class ExchangeConstants {
- public static final String EXCHANGE_DEFAULT = "exchange_default";
+ public static final String EXCHANGE_DEFAULT = "exchange_default_qay";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
index 47cee57..702f5f9 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
@@ -6,8 +6,8 @@
**/
public class QueueConstants {
- public static final String QUEUE_DEFAULT = "queue_default";
- public static final String AGENT_AUTO_LEVEL_UP = "queue_agent_auto_level_up";
- public static final String AGENT_RETURN_MONEY = "queue_agent_return_money";
- public static final String ORDER_RETURN_MONEY = "queue_order_return_money";
+ public static final String QUEUE_DEFAULT = "queue_default_qay";
+ public static final String AGENT_AUTO_LEVEL_UP = "queue_agent_auto_level_up_qay";
+ public static final String AGENT_RETURN_MONEY = "queue_agent_return_money_qay";
+ public static final String ORDER_RETURN_MONEY = "queue_order_return_money_qay";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java
index f9d7c1f..3676e47 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java
@@ -6,5 +6,5 @@
**/
public class RouteKeyConstants {
- public static final String ROUTE_KEY_DEFAULT = "route_key_default";
+ public static final String ROUTE_KEY_DEFAULT = "route_key_default_qay";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
index 46c50a1..a32d98e 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
@@ -34,7 +34,7 @@
log.info("消费者:{}", new String(message.getBody()));
}
- @RabbitListener(queues = "queue_order_delay")
+ @RabbitListener(queues = "queue_order_delay_qay")
public void orderCancelDelay(String id) {
try {
orderInfoService.autoCancelOrder(Long.parseLong(id));
diff --git a/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java b/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
index 90122ca..25b2216 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
@@ -5,14 +5,14 @@
@Getter
public enum RabbitQueueEnum {
- DEFAULT("exchange_default", "route_key_default", "queue_default"),
+ DEFAULT("exchange_default_qay", "route_key_default_qay", "queue_default_qay"),
- ORDER_CANCEL_DELAY_TTL("exchange_order_delay_ttl", "route_key_order_delay_ttl", "queue_order_delay_ttl"),
- ORDER_CANCEL_DELAY("exchange_order_delay", "route_key_order_delay", "queue_order_delay"),
+ ORDER_CANCEL_DELAY_TTL("exchange_order_delay_ttl_qay", "route_key_order_delay_ttl_qay", "queue_order_delay_ttl_qay"),
+ ORDER_CANCEL_DELAY("exchange_order_delay_qay", "route_key_order_delay_qay", "queue_order_delay_qay"),
- AGENT_REUTRN_MONEY("exchange_agent_return_money", "route_key_agent_return_money", "queue_agent_return_money"),
+ AGENT_REUTRN_MONEY("exchange_agent_return_money_qay", "route_key_agent_return_money_qay", "queue_agent_return_money_qay"),
- ORDER_RETURN_MONEY("exchange_order_return_money", "route_key_order_return_money", "queue_order_return_money");
+ ORDER_RETURN_MONEY("exchange_order_return_money_qay", "route_key_order_return_money_qay", "queue_order_return_money_qay");
private String exchange;
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index fbeab66..4d6688c 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -72,6 +72,10 @@
a.present_price,
a.score,
a.is_hot,
+ a.carriage_type,
+ a.carriage_amount,
+ a.carriage_rule_id,
+ a.goods_weight,
min(b.id) skuId,
min(b.present_price) price,
sum(b.stock) stock,
@@ -289,6 +293,10 @@
a.present_price,
a.score,
a.is_hot,
+ a.carriage_type,
+ a.carriage_amount,
+ a.carriage_rule_id,
+ a.goods_weight,
min(b.id) skuId,
min(b.present_price) price,
sum(b.stock) stock,
--
Gitblit v1.9.1