Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java

@@ -35,5 +35,11 @@
    @ApiModelProperty("咨询电话")
    private String phone;

    @ApiModelProperty("经度")
    private String lon;

    @ApiModelProperty("纬度")
    private String lat;

    private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideDO.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
@@ -38,5 +39,13 @@
     * 咨询电话
     */
    private String phone;
    /**
     * 经度
     */
    private String lon;
    /**
     * 纬度
     */
    private String lat;

}

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

@@ -162,6 +162,8 @@
        if (oldComShopStoreDO != null) {
            return R.fail("商家账号已注册");
        }
        //TODO 判断用户
        //this.baseMapper.select(storeVO.getPhone());
        //新增店铺先判断是否拥有已删除的店铺
        ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopStoreDO>()
                .eq(ComShopStoreDO::getStoreAccount, storeVO.getStoreAccount()).eq(ComShopStoreDO::getDeleteStatus,ComShopStoreDO.deleteStatus.yes));