代码提交

k94314517

2024-07-15 83430e4bd60f9a44ec76698fa04ee8d3373a1087

代码提交

 server/service/src/main/java/com/doumee/dao/business/model/Shop.java

@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -120,7 +122,7 @@
    @ApiModelProperty(value = "所属关联S码", example = "1")
    @ExcelColumn(name="所属关联S码")
    private String scode;
    @ApiModelProperty(value = "注册地" )
    @ApiModelProperty(value = "注册地(IAM)" )
    @ExcelColumn(name="注册地")
    private String regAddr;
    @ApiModelProperty(value = "法人身份证号" )
@@ -188,6 +190,19 @@
    @ApiModelProperty(value = "部门级别路径", example = "1")
    @ExcelColumn(name="部门级别路径")
    private String namePath;

    @ApiModelProperty(value = "经度", example = "1")
    @ExcelColumn(name="经度")
    private BigDecimal longitude;

    @ApiModelProperty(value = "纬度", example = "1")
    @ExcelColumn(name="纬度")
    private BigDecimal latitude;

    @ApiModelProperty(value = "地址")
    @ExcelColumn(name="地址")
    private String address;

    @ApiModelProperty(value = "父级部门级别路径", example = "1")
    @TableField(exist = false)
    private String parentIdPath;
@@ -215,4 +230,13 @@
    @ApiModelProperty(value = "下级部门集合", example = "1")
    @TableField(exist = false)
    private List<Shop> childList;

    @ApiModelProperty(value = "距离 ", example = "1")
    @TableField(exist = false)
    private BigDecimal distance;

    @ApiModelProperty(value = "门店导购列表 ", example = "1")
    @TableField(exist = false)
    private List<Users> usersList;

}

 server/service/src/main/java/com/doumee/dao/business/model/Users.java

@@ -134,8 +134,8 @@
    @ExcelColumn(name="服务客户数")
    private Integer costomerNum;

    @ApiModelProperty(value = "从业年月(yyyy-MM)")
    @ExcelColumn(name="从业年月(yyyy-MM)")
    @ApiModelProperty(value = "从业年份")
    @ExcelColumn(name="从业年月")
    private String jobDate;

    @ApiModelProperty(value = "宣传语")
@@ -145,6 +145,10 @@
    @ApiModelProperty(value = "个人二维码图片地址")
    @ExcelColumn(name="个人二维码图片地址")
    private String qrcodeImg;

    @ApiModelProperty(value = "企业二维码图片地址")
    @ExcelColumn(name="企业二维码图片地址")
    private String companyQrcodeImg;

    @ApiModelProperty(value = "邮箱")
    @ExcelColumn(name="邮箱")
@@ -179,7 +183,15 @@
    @ApiModelProperty(value = "完整头像录")
    @TableField(exist = false)
    private String imgurlFull;
    @ApiModelProperty(value = "个人二维码图片地址")
    @ApiModelProperty(value = "个人二维码图片完整地址")
    @TableField(exist = false)
    private String qrcodeImgFull;
    @ApiModelProperty(value = "门店地址")
    @TableField(exist = false)
    private String shopAddress;

    @ApiModelProperty(value = "企业二维码图片完整地址")
    @TableField(exist = false)
    private String companyQrcodeImgFull;

}

 server/service/src/main/java/com/doumee/dao/web/reqeust/ShopQueryByLLDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.doumee.dao.web.reqeust;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/12/7 11:19
 */
@Data
public class ShopQueryByLLDTO {

    @ApiModelProperty(value = "经度")
    private String longitude;

    @ApiModelProperty(value = "纬度")
    private String latitude;

}

 server/service/src/main/java/com/doumee/service/business/ShopService.java

@@ -5,6 +5,7 @@
import com.doumee.dao.admin.request.UpdateShopSortDTO;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.vo.ShopTreeVo;
import com.doumee.dao.web.reqeust.ShopQueryByLLDTO;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;
@@ -110,4 +111,18 @@
    void dealShopNamePath();

    List<Shop> listByParent(String parentId);

    /**
     * æ ¹æ®ç»çº¬åº¦ èŽ·å–门店列表
     * @param pageWrap
     * @return
     */
    PageData<Shop> queryShopByLL(PageWrap<Shop> pageWrap);

    /**
     * é—¨åº—详情
     * @param id
     * @return
     */
    Shop shopDetail(Long id,Long memberId);
}

 server/service/src/main/java/com/doumee/service/business/UsersService.java

@@ -105,4 +105,6 @@
    void bindingOpenid(String code,Long userId);

    String importBatch(MultipartFile file);

    Users usersDetail(Long userId);
}

 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -259,14 +259,13 @@

    @Override
    public AccountResponse wxLogin(String code){
//        try {
        try {
            //获取微信敏感数据
//            WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
//            String openId = session.getOpenid();
//            if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
//                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"获取openid失败！请联系管理员");
//            }
            String openId = code;
            WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
            String openId = session.getOpenid();
            if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"获取openid失败！请联系管理员");
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
            if (member == null) {
                member = new Member();
@@ -281,13 +280,13 @@
            String token = JwtTokenUtil.generateToken(payLoad);
            AccountResponse accountResponse = new AccountResponse();
            accountResponse.setToken(token);
//            accountResponse.setSessionKey(session.getSessionKey());
            accountResponse.setSessionKey(session.getSessionKey());
            accountResponse.setMember(member);
            return accountResponse;
//        } catch (WxErrorException e) {
//            e.printStackTrace();
//        }
//        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"微信登录异常！请联系管理员");
        } catch (WxErrorException e) {
            e.printStackTrace();
        }
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"微信登录异常！请联系管理员");
    }

    @Override

 server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -12,15 +13,15 @@
import com.doumee.dao.admin.request.FcodeImport;
import com.doumee.dao.admin.request.ShopImport;
import com.doumee.dao.admin.request.UpdateShopSortDTO;
import com.doumee.dao.business.CategoryMapper;
import com.doumee.dao.business.CategorySegMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.SegmentsMapper;
import com.doumee.dao.business.ShopMapper;
import com.doumee.dao.business.UsersMapper;
import com.doumee.dao.business.join.ShopJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ShopTree;
import com.doumee.dao.business.vo.ShopTreeVo;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.ShopQueryByLLDTO;
import com.doumee.service.business.ShopService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -41,7 +42,6 @@
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;

/**
 * å¿—邦组织信息表Service实现
@@ -55,10 +55,17 @@
    private RedisTemplate<String, Object> redisTemplate;
    @Autowired
    private ShopJoinMapper shopMapper;

    @Autowired
    private SegmentsMapper segmentsMapper;
    @Autowired
    private CategorySegMapper categorySegMapper;
    @Autowired
    private UsersMapper usersMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private MemberMapper memberMapper;

    @Override
    public Long create(Shop shop) {
@@ -858,4 +865,79 @@
            }
        }
    }



    @Override
    public PageData<Shop> queryShopByLL(PageWrap<Shop> pageWrap) {
        if(Objects.isNull(pageWrap.getModel())
                || Objects.isNull(pageWrap.getModel().getLatitude())
                || Objects.isNull(pageWrap.getModel().getLongitude())){
            return null;
        }
        IPage<Shop> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Shop> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE," +
                        " CONVERT (ST_Distance_Sphere (point ("+pageWrap.getModel().getLongitude()+", "+pageWrap.getModel().getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ")
                .eq("isdeleted",Constants.ZERO)
                .isNotNull("LATITUDE")
                .isNotNull("LONGITUDE")
                .eq("ATTRIBUTE",Constants.ONE)
                .orderByAsc(" distance ");
        Utils.MP.blankToNull(pageWrap.getModel());
        PageData<Shop> pageData = PageData.from(shopMapper.selectPage(page, queryWrapper));
        String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
        StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
        for (Shop shop:pageData.getRecords()) {
            //查询门店下导购数据
            List<Users> usersList =usersMapper.selectList(new QueryWrapper<Users>().lambda().eq(Users::getDepartmentId,shop.getId())
                    .eq(Users::getIsdeleted,Constants.ZERO)
                    .eq(Users::getStatus,Constants.ONE)
                    .eq(Users::getType,Constants.ZERO)
            );
            for (Users users:usersList) {
                if(StringUtils.isNotBlank(users.getImgurl())){
                    users.setImgurlFull(prefix + users.getImgurl());
                }
            }
            shop.setUsersList(usersList);
        }
        return pageData;
    }

    @Override
    public Shop shopDetail(Long id,Long memberId) {
        Member member = memberMapper.selectById(memberId);
        if(Objects.isNull(member)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"未查询到用户信息");
        }
        QueryWrapper<Shop> queryWrapper = new QueryWrapper<Shop>();
        //如果人员没有经纬度信息，则不查询距离
        if(Objects.nonNull(member.getLatitude())&&Objects.nonNull(member.getLongitude())){
            queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE," +
                    " CONVERT (ST_Distance_Sphere (point ("+member.getLongitude()+", "+member.getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ");
        }
        queryWrapper.eq("id",id);
        Shop shop = shopMapper.selectOne(queryWrapper);
        if(Objects.isNull(shop)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
                StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
        List<Users> usersList =usersMapper.selectList(new QueryWrapper<Users>().lambda().eq(Users::getDepartmentId,shop.getId())
                .eq(Users::getIsdeleted,Constants.ZERO)
                .eq(Users::getStatus,Constants.ONE)
                .eq(Users::getType,Constants.ZERO)
        );
        for (Users users:usersList) {
            if(StringUtils.isNotBlank(users.getImgurl())){
                users.setImgurlFull(prefix + users.getImgurl());
            }
        }
        shop.setUsersList(usersList);
        return shop;
    }



}

 server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java

@@ -600,5 +600,40 @@
        return null;
    }



    @Override
    public Users usersDetail(Long userId){
        Users users = usersMapper.selectById(userId);
        if(Objects.isNull(users)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
                StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
        if(StringUtils.isNotBlank(users.getImgurl())){
            users.setImgurlFull(prefix + users.getImgurl());
        }
        if(StringUtils.isNotBlank(users.getQrcodeImg())){
            users.setQrcodeImgFull(prefix + users.getQrcodeImg());
        }
        if(StringUtils.isNotBlank(users.getCompanyQrcodeImg())){
            users.setCompanyQrcodeImgFull(prefix + users.getCompanyQrcodeImg());
        }
        if(Objects.nonNull(users.getDepartmentId())){
            Shop shop = shopMapper.selectById(users.getDepartmentId());
            if(Objects.nonNull(shop)){
                users.setShopName(shop.getName());
                if(StringUtils.isNotBlank(shop.getAddress())){
                    users.setShopAddress(shop.getAddress());
                }else{
                    users.setShopAddress(shop.getProvinceName()+shop.getCityName()+shop.getAreaName()+shop.getTown()+shop.getRegAddr());
                }
            }
        }
        return users;
    }



}


 server/web/src/main/java/com/doumee/api/web/CustomerApi.java

@@ -4,19 +4,22 @@
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.CustomerLog;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.BjParamConfigResponse;
import com.doumee.service.business.BjParamService;
import com.doumee.service.business.CustomerService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -48,6 +51,12 @@

    @Autowired
    private ZbomCRMService zbomCRMService;

    @Autowired
    private ShopService shopService;

    @Autowired
    private UsersService usersService;

    @ApiOperation(value = "客户端小程序登陆", notes = "客户端小程序")
    @GetMapping("/wxLoginCustomer")
@@ -146,5 +155,37 @@
        return  ApiResponse.success("操作成功");
    }

    @LoginRequired
    @ApiOperation("门店列表")
    @PostMapping("/shopPage")   @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<PageData<Shop>> shopPage (@RequestBody PageWrap<Shop> pageWrap) {
        return ApiResponse.success(shopService.queryShopByLL(pageWrap));
    }


    @LoginRequired
    @ApiOperation("门店详情")
    @GetMapping("/shopDetail")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Long", name = "shopId", value = "门店主键", required = true)
    })
    public ApiResponse<Shop> shopDetail (@RequestParam Long shopId) {
        Long memberId = this.getMemberId();
        return ApiResponse.success(shopService.shopDetail(shopId,memberId));
    }

    @LoginRequired
    @ApiOperation("导购详情")
    @GetMapping("/usersDetail")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Long", name = "userId", value = "导购主键", required = true)
    })
    public ApiResponse<Users> usersDetail (@RequestParam Long userId) {
        return ApiResponse.success(usersService.usersDetail(userId));
    }

}