cxc/yshop-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
moxiangrong
2024-02-23 18:43:03 +08:00
parent 62684f1a2a
commit d6b833e181
8 changed files with 73 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
yshop-module-mp/yshop-module-mp-biz/src/main/java/co/yixiang/yshop/module/mp/controller/admin/customerservice/CustomerServiceController.java
View File

@ -1,11 +1,12 @@
package co.yixiang.yshop.module.mp.controller.admin.customerservice;
import cn.hutool.core.io.FileTypeUtil;
import cn.hutool.core.io.FileUtil;
import co.yixiang.yshop.framework.common.pojo.CommonResult;
import co.yixiang.yshop.framework.common.pojo.PageParam;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.AddServicerDTO;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.CustomerServiceVO;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.ServicerVO;
import co.yixiang.yshop.module.infra.api.file.FileApi;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.*;
import co.yixiang.yshop.module.mp.framework.cp.config.WxCpConfiguration;
import co.yixiang.yshop.module.mp.service.customerservice.CustomerServiceService;
import io.swagger.v3.oas.annotations.Operation;
@ -21,12 +22,15 @@ import me.chanjar.weixin.cp.api.WxCpMediaService;
import me.chanjar.weixin.cp.api.WxCpUserService;
import me.chanjar.weixin.cp.bean.WxCpDepart;
import me.chanjar.weixin.cp.bean.WxCpUser;
import me.chanjar.weixin.cp.bean.kf.*;
import me.chanjar.weixin.cp.bean.kf.WxCpKfAccountAddResp;
import me.chanjar.weixin.cp.bean.kf.WxCpKfAccountDel;
import me.chanjar.weixin.cp.bean.kf.WxCpKfServicerListResp;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.File;
import java.util.List;
import java.util.stream.Collectors;
@ -42,6 +46,8 @@ import java.util.stream.Collectors;
public class CustomerServiceController {
@Resource
private CustomerServiceService customerServiceService;
@Resource
private FileApi fileApi;
@SneakyThrows
@GetMapping("page")
@ -54,7 +60,7 @@ public class CustomerServiceController {
@SneakyThrows
@PostMapping
@Operation(summary = "新增客服")
public CommonResult<WxCpKfAccountAddResp> save(@RequestBody WxCpKfAccountAdd add) {
public CommonResult<WxCpKfAccountAddResp> save(@RequestBody WxCpKfAccountAddDTO add) {
WxCpKfAccountAddResp wxCpKfAccountAddResp = customerServiceService.save(add);
return CommonResult.success(wxCpKfAccountAddResp);
}
@ -62,7 +68,7 @@ public class CustomerServiceController {
@SneakyThrows
@PutMapping
@Operation(summary = "编辑客服")
public CommonResult<Boolean> update(@RequestBody WxCpKfAccountUpd upd) {
public CommonResult<Boolean> update(@RequestBody WxCpKfAccountUpdDTO upd) {
customerServiceService.update(upd);
return CommonResult.success(true);
}
@ -142,7 +148,16 @@ public class CustomerServiceController {
public CommonResult<WxMediaUploadResult> uploadMaterial(@RequestParam(value = "file") MultipartFile file) {
WxCpMediaService mediaService = WxCpConfiguration.getCpService().getMediaService();
WxMediaUploadResult upload = mediaService.upload(WxConsts.MediaFileType.IMAGE, file.getOriginalFilename(), file.getInputStream());
//获取url
File download = mediaService.download(upload.getMediaId());
String url = uploadFile(upload.getMediaId(), download);
upload.setUrl(url);
return CommonResult.success(upload);
}
private String uploadFile(String mediaId, File file) {
String path = mediaId + "." + FileTypeUtil.getType(file);
return fileApi.createFile(path, FileUtil.readBytes(file));
}
}

3
yshop-module-mp/yshop-module-mp-biz/src/main/java/co/yixiang/yshop/module/mp/controller/admin/customerservice/vo/CustomerServiceVO.java
View File

@ -18,6 +18,9 @@ public class CustomerServiceVO {
@Schema(description = "客服头像")
private String avatar;
@Schema(description = "客服头像")
private String avatarUrl;
@Schema(description = "客服地址")
private String accountLink;
}

13
yshop-module-mp/yshop-module-mp-biz/src/main/java/co/yixiang/yshop/module/mp/controller/admin/customerservice/vo/WxCpKfAccountAddDTO.java Normal file
View File

@ -0,0 +1,13 @@
package co.yixiang.yshop.module.mp.controller.admin.customerservice.vo;
import lombok.Data;
import me.chanjar.weixin.cp.bean.kf.WxCpKfAccountAdd;
/**
* @author pepis
* @apiNote
**/
@Data
public class WxCpKfAccountAddDTO extends WxCpKfAccountAdd {
private String avatarUrl;
}

13
yshop-module-mp/yshop-module-mp-biz/src/main/java/co/yixiang/yshop/module/mp/controller/admin/customerservice/vo/WxCpKfAccountUpdDTO.java Normal file
View File

@ -0,0 +1,13 @@
package co.yixiang.yshop.module.mp.controller.admin.customerservice.vo;
import lombok.Data;
import me.chanjar.weixin.cp.bean.kf.WxCpKfAccountUpd;
/**
* @author pepis
* @apiNote
**/
@Data
public class WxCpKfAccountUpdDTO extends WxCpKfAccountUpd {
private String avatarUrl;
}

5
yshop-module-mp/yshop-module-mp-biz/src/main/java/co/yixiang/yshop/module/mp/dal/dataobject/customerservice/CustomerServiceDO.java
View File

@ -45,4 +45,9 @@ public class CustomerServiceDO extends BaseDO {
* 客服头像
*/
private String avatar;
/**
* 客服头像url
*/
private String avatarUrl;
}

8
yshop-module-mp/yshop-module-mp-biz/src/main/java/co/yixiang/yshop/module/mp/service/customerservice/CustomerServiceService.java
View File

@ -3,11 +3,11 @@ package co.yixiang.yshop.module.mp.service.customerservice;
import co.yixiang.yshop.framework.common.pojo.PageParam;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.CustomerServiceVO;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.WxCpKfAccountAddDTO;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.WxCpKfAccountUpdDTO;
import co.yixiang.yshop.module.mp.dal.dataobject.customerservice.CustomerServiceDO;
import me.chanjar.weixin.cp.bean.kf.WxCpKfAccountAdd;
import me.chanjar.weixin.cp.bean.kf.WxCpKfAccountAddResp;
import me.chanjar.weixin.cp.bean.kf.WxCpKfAccountDel;
import me.chanjar.weixin.cp.bean.kf.WxCpKfAccountUpd;
import java.util.List;
@ -18,9 +18,9 @@ import java.util.List;
public interface CustomerServiceService {
PageResult<CustomerServiceVO> page(PageParam pageParam);
WxCpKfAccountAddResp save(WxCpKfAccountAdd add);
WxCpKfAccountAddResp save(WxCpKfAccountAddDTO add);
void update(WxCpKfAccountUpd upd);
void update(WxCpKfAccountUpdDTO upd);
void delete(WxCpKfAccountDel del);

11
yshop-module-mp/yshop-module-mp-biz/src/main/java/co/yixiang/yshop/module/mp/service/customerservice/CustomerServiceServiceImpl.java
View File

@ -3,6 +3,8 @@ package co.yixiang.yshop.module.mp.service.customerservice;
import co.yixiang.yshop.framework.common.pojo.PageParam;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.CustomerServiceVO;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.WxCpKfAccountAddDTO;
import co.yixiang.yshop.module.mp.controller.admin.customerservice.vo.WxCpKfAccountUpdDTO;
import co.yixiang.yshop.module.mp.dal.dataobject.customerservice.CustomerServiceDO;
import co.yixiang.yshop.module.mp.dal.mysql.customerservice.CustomerServiceMapper;
import co.yixiang.yshop.module.mp.framework.cp.config.WxCpConfiguration;
@ -33,12 +35,13 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
public PageResult<CustomerServiceVO> page(PageParam pageParam) {
WxCpKfService kfService = WxCpConfiguration.getCpService().getKfService();
//客服列表
PageResult<CustomerServiceDO> page = mapper.selectPage(pageParam, Wrappers.emptyWrapper());
PageResult<CustomerServiceDO> page = mapper.selectPage(pageParam, Wrappers.<CustomerServiceDO>lambdaQuery().orderByDesc(CustomerServiceDO::getId));
List<CustomerServiceVO> collect = page.getList().stream().map(item -> {
CustomerServiceVO customerServiceVO = new CustomerServiceVO();
customerServiceVO.setName(item.getName());
customerServiceVO.setAvatar(item.getAvatar());
customerServiceVO.setOpenKfid(item.getOpenKfid());
customerServiceVO.setAvatarUrl(item.getAvatarUrl());
//客服链接
WxCpKfAccountLink link = new WxCpKfAccountLink();
link.setOpenKfid(item.getOpenKfid());
@ -60,26 +63,28 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
@Override
@SneakyThrows
public WxCpKfAccountAddResp save(WxCpKfAccountAdd add) {
public WxCpKfAccountAddResp save(WxCpKfAccountAddDTO add) {
WxCpKfService kfService = WxCpConfiguration.getCpService().getKfService();
WxCpKfAccountAddResp wxCpKfAccountAddResp = kfService.addAccount(add);
CustomerServiceDO customerServiceDO = new CustomerServiceDO();
customerServiceDO.setName(add.getName());
customerServiceDO.setAvatar(add.getMediaId());
customerServiceDO.setOpenKfid(wxCpKfAccountAddResp.getOpenKfid());
customerServiceDO.setAvatarUrl(add.getAvatarUrl());
mapper.insert(customerServiceDO);
return wxCpKfAccountAddResp;
}
@SneakyThrows
@Override
public void update(WxCpKfAccountUpd upd) {
public void update(WxCpKfAccountUpdDTO upd) {
WxCpKfService kfService = WxCpConfiguration.getCpService().getKfService();
WxCpBaseResp resp = kfService.updAccount(upd);
CustomerServiceDO customerServiceDO = new CustomerServiceDO();
customerServiceDO.setName(upd.getName());
customerServiceDO.setAvatar(upd.getMediaId());
customerServiceDO.setOpenKfid(upd.getOpenKfid());
customerServiceDO.setAvatarUrl(upd.getAvatarUrl());
mapper.update(customerServiceDO, Wrappers.<CustomerServiceDO>lambdaUpdate().eq(CustomerServiceDO::getOpenKfid, upd.getOpenKfid()));
}