#feat 订单信息增加

yanghui

2022-11-28 ba46a830ec8b8b8a01372fbef732e4cc7e1f6bd7

#feat 订单信息增加

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java

@@ -68,10 +68,6 @@
    @ApiModelProperty(value = "支付单号")
    private String payNo;

    @ApiModelProperty(value = "发货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date deliveryTime;

    @ApiModelProperty(value = "收货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date receivingTime;
@@ -121,4 +117,16 @@

    @ApiModelProperty(value = "商品规格图")
    private String goodsAttrPic;

    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date cancelTime;

    @ApiModelProperty(value = "配送时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date deliveryTime;

    @ApiModelProperty(value = "送达时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date serviceTime;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java

@@ -477,6 +477,11 @@
            orderVO.setRefundAmount(comShopFlowerRefundOrderDO.getRefundAmount());
        }

        //如果状态时取消状态，更新时间为去取消时间
        if (shopOrderDO.getStatus() == ComShopFlowerOrderDO.status.yqx){
            orderVO.setCancelTime(shopOrderDO.getUpdateAt());
        }

        return R.ok(orderVO);
    }