Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 4c77f59b41ea3383a115f780a94debd71f035a87

Merge branch 'local_20221104' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java

@@ -22,7 +22,7 @@
    private Integer status;

    @ApiModelProperty(value = "自提点id")
    private Integer pointId;
    private Long pointId;

    @ApiModelProperty(value = "商户id")
    private Long storeId;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml

@@ -56,7 +56,7 @@
            resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO">
        SELECT ccep.*,count(csfo.id) delivery_order_num ,sum(og.amount) delivery_goods_num
        FROM com_convenient_elevating_point ccep
        LEFT JOIN com_shop_flower_order ON ccep.id = csfo.point_id
        LEFT JOIN com_shop_flower_order csfo ON ccep.id = csfo.point_id
        LEFT JOIN com_shop_flower_order_goods og ON og.order_id = csfo.id
        WHERE
        csfo.`status` = 1