bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2024-12-17 19:11:06 +08:00
parent 21ce286933 cbeb16ca28
commit bd786ed49f
2 changed files with 84 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
View File

@ -32,12 +32,12 @@ public class BmContractServiceImpl implements BmContractService {
public List<BmContract> list(BmContract bmContract) {
bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
List<BmContract> list = bmContractMapper.list(bmContract);
/* for (BmContract contract : list) {
for (BmContract contract : list) {
BmFileInfo bmFileInfo = new BmFileInfo();
bmFileInfo.setModelId(Long.valueOf(contract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L);
List<BmFileInfo> bmFileInfos = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo);
contract.setBmFileInfoList(bmFileInfos);
}*/
}
return list;
}
@ -48,7 +48,7 @@ public class BmContractServiceImpl implements BmContractService {
bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
bmContract.setStatus(0);
Integer add = bmContractMapper.add(bmContract);
/* if (add > 0) {
if (add > 0) {
if (bmContract.getBmFileInfoList().size() > 0) {
for (BmFileInfo bmFileInfo : bmContract.getBmFileInfoList()) {
bmFileInfo.setModelId(Long.valueOf(bmContract.getId()));
@ -59,7 +59,7 @@ public class BmContractServiceImpl implements BmContractService {
bmFileInfoMapper.insertBmFileInfo(bmFileInfo);
}
}
}*/
}
return add;
}
@ -68,7 +68,7 @@ public class BmContractServiceImpl implements BmContractService {
bmContract.setOwnerId(SecurityUtils.getLoginUser().getUserid());
bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
Integer edit = bmContractMapper.edit(bmContract);
/* if (edit > 0) {
if (edit > 0) {
if (bmContract.getBmFileInfoList().size() > 0) {
BmFileInfo fileInfo = new BmFileInfo();
fileInfo.setModelId(Long.valueOf(bmContract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L);
@ -82,18 +82,18 @@ public class BmContractServiceImpl implements BmContractService {
bmFileInfoMapper.insertBmFileInfo(bmFileInfo);
}
}
}*/
}
return edit;
}
@Override
public Integer del(BmContract bmContract) {
Integer del = bmContractMapper.del(bmContract);
/* if (del > 0) {
if (del > 0) {
BmFileInfo fileInfo = new BmFileInfo();
fileInfo.setModelId(Long.valueOf(bmContract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L);
bmFileInfoMapper.deleteBmFileInfo(fileInfo);
}*/
}
return del;
}

85
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -1,6 +1,7 @@
package com.bonus.material.order.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.text.StrBuilder;
import com.bonus.common.biz.enums.MaStatusEnum;
import com.bonus.common.biz.enums.OrderStatusEnum;
import com.bonus.common.core.web.controller.BaseController;
@ -10,6 +11,7 @@ import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.book.domain.BookCarInfoDto;
import com.bonus.material.contract.domain.BmContract;
import com.bonus.material.contract.service.BmContractService;
import com.bonus.material.device.domain.vo.DevInfoVo;
import com.bonus.material.order.domain.OrderDetailCostReliefDto;
import com.bonus.material.order.domain.OrderDetailDto;
import com.bonus.material.order.domain.OrderInfoDto;
@ -174,10 +176,11 @@ public class OrderController extends BaseController {
}
}
/*@ApiOperation(value = "租赁协议(查看)")
@ApiOperation(value = "租赁协议(查看)")
@GetMapping("/leaseAgreement")
public AjaxResult getleaseAgreement(String orderId, Map<String, String> replacements) throws IOException, ParseException {
OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId);
List<OrderDetailDto> orderDetailsByOrderId = orderMapper.selectOrderDetailsByOderId(orderId);
BmContract bmContract = new BmContract();
bmContract.setStatus(1);
List<BmContract> list = bmContractService.list(bmContract);
@ -199,6 +202,24 @@ public class OrderController extends BaseController {
replacements.put("${companyName}", orderInfoDto.getCompanyName());
//订单金额
replacements.put("${cost}", orderInfoDto.getCost().toString());
//订单详情
StrBuilder orderDetail = new StrBuilder();
for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) {
Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString());
String beginTime = outputFormat.format(rentBeginTime);
Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString());
String endTime = outputFormat.format(rentEndTime);
// 添加每一行的内容
orderDetail.append("\n");
orderDetail.append("机具名称：").append(orderDetailDto.getDeviceName()).append("\n")
.append("租期：").append(beginTime).append(" 至 ").append(endTime).append("\n")
.append("天数：").append(orderDetailDto.getDays()).append("天").append("\n")
.append("租金：").append(orderDetailDto.getDayLeasePrice()).append("元/天").append("\n")
.append("数量：").append(orderDetailDto.getNum()).append("个").append("\n");
}
// 将拼接的字符串放入替换的map中
replacements.put("${orderTable}", orderDetail.toString());
for (IBodyElement element : document.getBodyElements()) {
if (element instanceof XWPFParagraph) {
@ -221,12 +242,12 @@ public class OrderController extends BaseController {
MultipartFile file = new MockMultipartFile("contract", "contract.docx", MediaType.APPLICATION_OCTET_STREAM_VALUE, wordBytes);
return sysFileService.upload(file);
}*/
}
@ApiOperation(value = "租赁协议(查看)")
/* @ApiOperation(value = "租赁协议(查看)")
@GetMapping("/leaseAgreement")
public AjaxResult getleaseAgreement(String orderId, Map<String, Object> replacements) throws ParseException {
public AjaxResult getleaseAgreement(String orderId, Map<String, String> replacements) throws ParseException {
OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId);
List<OrderDetailDto> orderDetailsByOrderId = orderMapper.selectOrderDetailsByOderId(orderId);
String dateStr = orderInfoDto.getOrderTime().toString();
@ -235,27 +256,71 @@ public class OrderController extends BaseController {
Date date = inputFormat.parse(dateStr);
String formattedDate = outputFormat.format(date);
//订单日期
replacements.put("${orderTime}", formattedDate);
replacements.put("orderTime", formattedDate);
//装备所属公司
replacements.put("${czcompanyName}", orderInfoDto.getCzcompanyName());
replacements.put("czCompanyName", orderInfoDto.getCzcompanyName());
//承租方所属公司
replacements.put("${companyName}", orderInfoDto.getCompanyName());
replacements.put("companyName", orderInfoDto.getCompanyName());
//订单金额
replacements.put("${cost}", orderInfoDto.getCost().toString());
replacements.put("cost", orderInfoDto.getCost().toString());
//订单详情
String orderDetail = "";
for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) {
orderDetail += "<p>机具名称：" + orderDetailDto.getDeviceName() + "&nbsp&nbsp;租期：" + orderDetailDto.getRentBeginTime() + "至" + orderDetailDto.getRentEndTime() + "&nbsp&nbsp;天数：" + orderDetailDto.getDays() + "天 &nbsp;租金：" + orderDetailDto.getDayLeasePrice() + "元/天&nbsp&nbsp;数量：" + orderDetailDto.getNum() + "</p>";
Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString());
String beginTime = outputFormat.format(rentBeginTime);
Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString());
String endTime = outputFormat.format(rentEndTime);
orderDetail += "<p>机具名称：" + orderDetailDto.getDeviceName() + "<br>租期：" + beginTime + "至" + endTime + "<br>天数：" + orderDetailDto.getDays() + "天 <br>租金：" + orderDetailDto.getDayLeasePrice() + "元/天<br>数量：" + orderDetailDto.getNum() + "</p>";
}
replacements.put("${orderTable}", orderDetail);
replacements.put("orderTable", orderDetail);
BmContract bmContract = new BmContract();
bmContract.setStatus(1);
List<BmContract> list = bmContractService.list(bmContract);
String content = list.get(0).getContent();
if (StringUtils.isBlank(content)){
content = bmContractService.lisTemplate(bmContract).get(0).getContent();
}
StrSubstitutor sub = new StrSubstitutor(replacements);
String result = sub.replace(content);
return AjaxResult.success(result);
}*/
/* @ApiOperation(value = "购物车协议(查看)")
@GetMapping("/bookCarAgreement")
public AjaxResult getbookCarAgreement(OrderInfoDto orderInfoDto, Map<String, Object> replacements) throws ParseException {
if (orderInfoDto != null) {
SimpleDateFormat inputFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//装备所属公司
replacements.put("czcompanyName", orderInfoDto.getCzcompanyName());
//承租方所属公司
replacements.put("companyName", orderInfoDto.getCompanyName());
//订单金额
replacements.put("cost", orderInfoDto.getCost().toString());
//订单详情
String orderDetail = "";
List<OrderDetailDto> detailsList = orderInfoDto.getDetailsList();
for (OrderDetailDto orderDetailDto : detailsList) {
Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString());
String beginTime = outputFormat.format(rentBeginTime);
Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString());
String endTime = outputFormat.format(rentEndTime);
orderDetail += "<p>机具名称：" + orderDetailDto.getDeviceName() + "<br>租期：" + beginTime + "至" + endTime + "<br>天数：" + orderDetailDto.getDays() + "天 <br>租金：" + orderDetailDto.getDayLeasePrice() + "元/天<br>数量：" + orderDetailDto.getNum() + "</p>";
}
replacements.put("orderTable", orderDetail);
}
BmContract bmContract = new BmContract();
bmContract.setStatus(1);
List<BmContract> list = bmContractService.list(bmContract);
String content = list.get(0).getContent();
if (StringUtils.isBlank(content)){
content = bmContractService.lisTemplate(bmContract).get(0).getContent();
}
StrSubstitutor sub = new StrSubstitutor(replacements);
String result = sub.replace(content);
return AjaxResult.success(result);
}*/
}