yxt_product
/
oms-biz
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

商享通更新图片

master
fanzongzhe 10 months ago
parent
89d6c9b49d
commit
c90c2dbb4f
4 changed files with 71 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java
  2. 7
      oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java
  3. 12
      oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java
  4. 54
      oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java

6
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java
View File

@ -1,6 +1,7 @@
package com.yxt.oms.apiadmin.aggregation;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.DateUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -45,7 +46,8 @@ public class CrmVisitRest {
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private CrmFileFeign crmFileFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
/**
* pc端某客户的跟进记录分页列表
@ -85,6 +87,7 @@ public class CrmVisitRest {
String sid = entity.getSid();
String staffSid = dto.getStaffSid();
BeanUtil.copyProperties(pcCrmvisitAppendixDto, pcCommonAppendixDto);
pcCommonAppendixDto.setFilePath(pcCrmvisitAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), ""));
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String createTime = simpleDateFormat.format(new Date());
if (dto.getList().size() != 0) {
@ -137,6 +140,7 @@ public class CrmVisitRest {
PcCommonAppendixDto pcCommonAppendixDto = new PcCommonAppendixDto();
String staffSid = dto.getStaffSid();
BeanUtil.copyProperties(pcCrmvisitAppendixDto, pcCommonAppendixDto);
pcCommonAppendixDto.setFilePath(pcCrmvisitAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), ""));
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String createTime = simpleDateFormat.format(new Date());
if (dto.getList().size() != 0) {

7
oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java
View File

@ -193,6 +193,7 @@ public class CrmCustomerTempService {
PcCommonAppendixDto pcCommonAppendixDto = new PcCommonAppendixDto();
PcCrmVisitAppendixDto pcCrmVisitAppendixDto = list.get(i);
BeanUtils.copyProperties(pcCrmVisitAppendixDto, pcCommonAppendixDto);
pcCommonAppendixDto.setFilePath(pcCrmVisitAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), ""));
pcCommonAppendixDtoList.add(pcCommonAppendixDto);
}
crmFileFeign.saveCommonAppendix(visitSid, pcCommonAppendixDtoList);
@ -207,7 +208,7 @@ public class CrmCustomerTempService {
if (StringUtils.isNotBlank(dto.getUserSid())) {
pcCommonAppendixDto.setCreateBySid(dto.getUserSid());
}
pcCommonAppendixDto.setFilePath(url.getUrl());
pcCommonAppendixDto.setFilePath(url.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""));
pcCommonAppendixDtoList.add(pcCommonAppendixDto);
}
crmFileFeign.saveAppendix(visitSid, CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType(), pcCommonAppendixDtoList);
@ -290,7 +291,7 @@ public class CrmCustomerTempService {
if (StringUtils.isNotBlank(dto.getUserSid())) {
pcCommonAppendixDto.setCreateBySid(dto.getUserSid());
}
pcCommonAppendixDto.setFilePath(url.getUrl());
pcCommonAppendixDto.setFilePath(url.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""));
pcCommonAppendixDtoList.add(pcCommonAppendixDto);
}
crmFileFeign.saveAppendix(sid, CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType(), pcCommonAppendixDtoList);
@ -316,7 +317,7 @@ public class CrmCustomerTempService {
List<FileQueryUrl> list = new ArrayList<>();
for (CommonAppendixVo appendixVo : appendixVos) {
FileQueryUrl queryUrl = new FileQueryUrl();
queryUrl.setUrl(appendixVo.getFilePath());
queryUrl.setUrl(fileUploadComponent.getUrlPrefix() + appendixVo.getFilePath());
list.add(queryUrl);
}
vo.setCustomerFiles(list);

12
oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java
View File

@ -58,14 +58,22 @@ import java.util.List;
* @since 1.0
*/
@Service
public class CrmFileService {
public class CrmFileService {
@Autowired
private CrmFileFeign crmFileFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
public ResultBean<List<CommonAppendixVo>> getPcAppendix(CommonAppendixSelectQuery query) {
ResultBean rb = ResultBean.fireFail();
List<CommonAppendixVo> data = crmFileFeign.getPcAppendix(query).getData();
if (!data.isEmpty()) {
for (CommonAppendixVo datum : data) {
datum.setFilePath(fileUploadComponent.getUrlPrefix() + datum.getFilePath());
}
}
return crmFileFeign.getPcAppendix(query);
}
}

54
oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
View File

@ -28,13 +28,16 @@ package com.yxt.oms.biz.func.smssalesbill;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl;
import com.yxt.oms.feign.sales.smssalesbill.SmsSalesBillFeign;
import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign;
import com.yxt.oms.utils.FileQueryUrl;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -65,6 +68,9 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
private SmsSalesBillFeign smsSalesBillFeign;
@Resource
private WarehouseInventoryFeign warehouseInventoryFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
private QueryWrapper<SmsSalesBill> createQueryWrapper(SmsSalesBillQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -82,6 +88,28 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
}
public ResultBean saveOrUpdateDto(SmsSalesBillDto dto) {
List<SmsSalesBillDetailDetailsVo> goodsList = dto.getGoodsList();
if (!goodsList.isEmpty() && goodsList.size() > 0) {
for (SmsSalesBillDetailDetailsVo smsSalesBillDetailDetailsVo : goodsList) {
List<String> pic = smsSalesBillDetailDetailsVo.getPic();
List<String> pic2 = new ArrayList<>();
if (!pic.isEmpty() && pic.size() > 0) {
for (String appendixUrl : pic) {
appendixUrl = appendixUrl.replace(fileUploadComponent.getUrlPrefix(), "");
pic2.add(appendixUrl);
}
smsSalesBillDetailDetailsVo.setPic(pic2);
}
}
}
List<FileQueryUrl> files = dto.getFiles();
if (!files.isEmpty() && files.size() > 0) {
for (FileQueryUrl appendixUrl : files) {
String filePath = appendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
appendixUrl.setUrl(filePath);
}
}
return smsSalesBillFeign.save(dto);
}
@ -102,7 +130,29 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
}
public ResultBean<SmsSalesBillDetailsVo> fetchDetailsVoBySid(String sid) {
return smsSalesBillFeign.fetchDetailsBySid(sid);
ResultBean rb = ResultBean.fireFail();
SmsSalesBillDetailsVo vo = smsSalesBillFeign.fetchDetailsBySid(sid).getData();
List<SmsSalesBillDetailDetailsVo> goods = vo.getGoodsList();
if (!goods.isEmpty()) {
for (SmsSalesBillDetailDetailsVo detail : goods) {
List<String> pic = detail.getPic();
List<String> picList = new ArrayList<>();
if (!pic.isEmpty() && pic.size() > 0) {
for (String s : pic) {
picList.add(fileUploadComponent.getUrlPrefix() + s);
}
detail.setPic(picList);
}
}
}
List<FileQueryUrl> appendixList = vo.getFiles();
if (!appendixList.isEmpty()) {
for (FileQueryUrl aseAppendixUrl : appendixList) {
String url = fileUploadComponent.getUrlPrefix() + aseAppendixUrl.getUrl();
aseAppendixUrl.setUrl(url);
}
}
return rb.success().setData(vo);
}
public ResultBean<PagerVo<SmsSalesBillVo>> listPage(PagerQuery<SmsSalesBillQuery> pq) {
@ -118,7 +168,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
}
public ResultBean<ReviewDetailsVo> reviewDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
ResultBean rb = ResultBean.fireFail();
ReviewDetailsVo data = smsSalesBillFeign.reviewDetails(sid).getData();
List<ReviewGoods> goods = data.getGoods();
if (!goods.isEmpty()) {

Write Preview
Loading…
Cancel
Save