Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

xiaoyong931011

2022-06-08 d43ba88a830642d3351f907cfc59313b9e318e0e

 src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java

@@ -63,7 +63,13 @@
    @ApiModelProperty(value = "剩余时间")
    private Long remainTime;

    @ApiModelProperty(value = "运费")
    private BigDecimal carriage;

    public Integer getPayMethodType() {
        if (this.payMethod == null) {
            return 0;
        }
        switch (this.payMethod) {
            case "微信支付" :
                return 1;