prod参数修改

xiaoyong931011

2023-02-10 8fd05c6fd4b970cd86ec2341d1bd39e20ecc407f

prod参数修改

 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("参数错误");

 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;
}

 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;
}

 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";
}

 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";
}

 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";
}

 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));

 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;


 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,