fix

Helius

2021-09-27 1326c8bcf6094f48688a36dfc8b9c3de5e66e8b8

fix

 src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java

@@ -21,7 +21,7 @@
    @ApiModelProperty(value = "搜索参数", example = "1")
    private String query;

    @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-退款或退款中")
    @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-退款或退款中 5-已取消")
    private Integer status;

    @ApiModelProperty(hidden = true)

 src/main/java/cc/mrbird/febs/mall/service/IAgentService.java

@@ -5,4 +5,6 @@
    void autoUpAgentLevel(Long memberId);

    void returnMoneyToAgent(Long orderId);

    void rankReturnMoney(Long orderId);
}

 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java

@@ -229,4 +229,9 @@

        return JSONObject.parseObject(dic.getValue(), AgentInfo.class);
    }

    @Override
    public void rankReturnMoney(Long orderId) {

    }
}

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -195,6 +195,9 @@
        Map<String, Object> map = new HashMap<>();
        map.put("orderNo", orderNo);
        map.put("orderId", orderInfo.getId());

        agentProducer.sendAutoLevelUpMsg(member.getId());
        agentProducer.sendReturnMoneyMsg(orderInfo.getId());
        return map;
    }

@@ -275,9 +278,6 @@
        orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
        orderInfo.setReceivingTime(new Date());
        this.baseMapper.updateById(orderInfo);

        agentProducer.sendAutoLevelUpMsg(member.getId());
        agentProducer.sendReturnMoneyMsg(orderInfo.getId());
    }

    @Override

 src/main/resources/mapper/modules/MallOrderInfoMapper.xml

@@ -96,6 +96,9 @@
            <if test="record.status != 4 and record.status != 0">
                and a.status = #{record.status}
            </if>
            <if test="record.status == 5">
                and a.status = 7
            </if>
            <if test="record.memberId != null">
                and a.member_id=#{record.memberId}
            </if>
@@ -147,7 +150,7 @@
        select IFNULL(count(1), 0) from mall_order_info a
          inner join mall_member b on a.member_id=b.ID
        <where>
            a.status=4
            a.status in (2,3,4)
            <if test="type == 1">
                and b.referrer_id=#{inviteId}
            </if>