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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,19 +1,20 @@
package com.panzhihua.service_community.service.impl;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComShopUserAddressDAO;
import com.panzhihua.service_community.model.dos.ComShopUserAddressDO;
import com.panzhihua.service_community.service.ComShopUserAddressService;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
 * @auther lyq
@@ -22,11 +23,14 @@
 */
@Slf4j
@Service
public class ComShopUserAddressServiceImpl extends ServiceImpl<ComShopUserAddressDAO, ComShopUserAddressDO> implements ComShopUserAddressService {
public class ComShopUserAddressServiceImpl extends ServiceImpl<ComShopUserAddressDAO, ComShopUserAddressDO>
    implements ComShopUserAddressService {

    /**
     * 查询用户收获地址列表
     * @param comShopAddressDTO    请求参数
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return  用户收货地址列表
     */
    @Override
@@ -37,7 +41,9 @@

    /**
     * 用户添加收货地址
     * @param comShopAddressDTO 请求参数
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return  添加结果
     */
    @Override
@@ -65,7 +71,9 @@

    /**
     * 用户修改收货地址
     * @param comShopAddressDTO 请求参数
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return  修改结果
     */
    @Override
@@ -101,7 +109,9 @@

    /**
     * 用户删除收货地址
     * @param addressId 收货地址id
     * 
     * @param addressId
     *            收货地址id
     * @return  删除结果
     */
    public R shopDelUserAddress(Long addressId){