20220822

xiaoyong931011

2022-08-30 bd462ef219a0cea612ac0bba983403919b62b67a

20220822

 src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java

@@ -115,6 +115,10 @@
    private String addressArea;
    @TableField(exist = false)
    private String detailAddress;
    @TableField(exist = false)
    private Double leaderLongitude;
    @TableField(exist = false)
    private Double leaderLatitude;
    /**
     * 微信订单编号
     */

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

@@ -107,6 +107,10 @@
    private String addressArea;
    @ApiModelProperty(value = "自提点详细地址")
    private String detailAddress;
    @ApiModelProperty(value = "自提点经度")
    private Double leaderLongitude;
    @ApiModelProperty(value = "自提点纬度")
    private Double leaderLatitude;
    @ApiModelProperty(value = "配送状态 1：待配送 2：配送中 3：已送达")
    private Integer deliveryState;
    @ApiModelProperty(value = "是否送货上门  1：是 2：否")

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

@@ -134,6 +134,9 @@
        <result column="address_pic" property="addressPic" />
        <result column="address_area" property="addressArea" />
        <result column="province" property="province" />
        <result column="longitude" property="leaderLongitude" />
        <result column="latitude" property="leaderLatitude" />
        <result column="province" property="province" />
        <result column="city" property="city" />
        <result column="township" property="township" />
        <result column="detail_address" property="detailAddress" />
@@ -227,6 +230,8 @@
            c.province,
            c.city,
            c.township,
            c.longitude leaderLongitude,
            c.latitude leaderLatitude,
            c.detail_address
        from mall_order_info a
             inner join mall_order_item b on a.id=b.order_id