Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

huanghongfa

2022-04-14 e378405bd2968d78d1ddf43b5e326f19d39fa4a3

Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderAddressDto.java

@@ -30,6 +30,9 @@
    @ApiModelProperty(value = "收货地区")
    private String receivingRegion;

    @ApiModelProperty(value = "收货地区Code")
    private String receivingRegionCode;

    @ApiModelProperty(value = "收货详细地址")
    private String receivingAddress;


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

@@ -58,7 +58,7 @@
        ComChangeCarModel entity = new ComChangeCarModel();
        BeanUtils.copyProperties(comChangeCarModel, entity);
        if (this.baseMapper.insert(entity) > 0) {
            return R.ok();
            return R.ok(entity.getId());
        }
        return R.fail("添加失败");
    }

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

@@ -70,7 +70,7 @@
        ComChangeCarModelSpecs entity = new ComChangeCarModelSpecs();
        BeanUtils.copyProperties(comChangeCarModelSpecs, entity);
        if (this.baseMapper.insert(entity) > 0) {
            return R.ok();
            return R.ok(entity.getId());
        }
        return R.fail("添加失败");
    }

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

@@ -59,6 +59,7 @@
        com_change_car_model as cccm
        left join com_change_car_brand as cccb on cccb.id = cccm.brand_id
        <where>
            and cccm.is_del = 2
            <if test="dto.id != null">
                and cccm.id = #{dto.id}
            </if>
@@ -98,6 +99,7 @@
        com_change_car_model as cccm
        left join com_change_car_brand as cccb on cccb.id = cccm.brand_id
        <where>
            and cccm.is_del = 2
            <if test="dto.id != null">
                and cccm.id = #{dto.id}
            </if>

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

@@ -35,7 +35,6 @@
                and `name` = #{dto.name}
            </if>
        </where>
        order by create_at desc
    </select>

    <!--查询所有数据-->
@@ -55,15 +54,13 @@
                and `name` = #{dto.name}
            </if>
        </where>
        order by create_at desc
    </select>

    <select id="queryAllBySpecsId" resultType="com.panzhihua.common.model.vos.common.ComChangeCarModelSpecsChildrenVo">
        select
        id, specs_id, name, is_del
        from com_change_car_model_specs_children
        where is_del = 2 and specs_id = #{dto.specsId}
        order by create_at desc
        where is_del = 2 and specs_id = #{specsId}
    </select>

</mapper>