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-18 10:19:53 +08:00
parent 34359bca8e df8a7f3245
commit 8c4a37ba0a
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java
View File

@ -38,9 +38,9 @@ public class BmContractController extends BaseController {
@ApiOperation(value = "合同新增") @ApiOperation(value = "合同新增")
@PostMapping("/add") @PostMapping("/add")
public AjaxResult add(@RequestBody BmContract bmContract) { public AjaxResult add(@RequestBody BmContract bmContract) {
String decode = URLDecoder.decode(bmContract.getContent()); /* String decode = URLDecoder.decode(bmContract.getContent());
decode = decode.replace("&#36", "$"); decode = decode.replace("&#36", "$");
bmContract.setContent(decode); bmContract.setContent(decode);*/
Integer i = bmContractService.add(bmContract); Integer i = bmContractService.add(bmContract);
if (i > 0){ if (i > 0){
return AjaxResult.success("新增成功"); return AjaxResult.success("新增成功");
@ -51,9 +51,9 @@ public class BmContractController extends BaseController {
@ApiOperation(value = "合同修改") @ApiOperation(value = "合同修改")
@PostMapping("/edit") @PostMapping("/edit")
public AjaxResult edit(@RequestBody BmContract bmContract) { public AjaxResult edit(@RequestBody BmContract bmContract) {
String decode = URLDecoder.decode(bmContract.getContent()); /* String decode = URLDecoder.decode(bmContract.getContent());
decode = decode.replace("&#36", "$"); decode = decode.replace("&#36", "$");
bmContract.setContent(decode); bmContract.setContent(decode);*/
Integer i = bmContractService.edit(bmContract); Integer i = bmContractService.edit(bmContract);
if (i > 0){ if (i > 0){
return AjaxResult.success("修改成功"); return AjaxResult.success("修改成功");

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

@ -108,7 +108,8 @@ public class BmContractServiceImpl implements BmContractService {
if (i > 0) { if (i > 0) {
// 其他的禁用 // 其他的禁用
bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
return bmContractMapper.updateStatusOther(bmContract); bmContractMapper.updateStatusOther(bmContract);
return i;
} else { } else {
return i; return i;
} }

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

@ -192,7 +192,7 @@ public class OrderController extends BaseController {
} }
} }
/* @ApiOperation(value = "租赁协议(查看)") @ApiOperation(value = "租赁协议(查看)-word方式")
@GetMapping("/leaseAgreement") @GetMapping("/leaseAgreement")
public AjaxResult leaseAgreement(String orderId, Map<String, String> replacements) throws IOException, ParseException { public AjaxResult leaseAgreement(String orderId, Map<String, String> replacements) throws IOException, ParseException {
OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId);
@ -258,9 +258,9 @@ public class OrderController extends BaseController {
MultipartFile file = new MockMultipartFile("contract", "contract.docx", MediaType.APPLICATION_OCTET_STREAM_VALUE, wordBytes); MultipartFile file = new MockMultipartFile("contract", "contract.docx", MediaType.APPLICATION_OCTET_STREAM_VALUE, wordBytes);
return sysFileService.upload(file); return sysFileService.upload(file);
}*/ }
/* @ApiOperation(value = "购物车协议(查看)") @ApiOperation(value = "购物车协议(查看)-word方式")
@GetMapping("/bookCarAgreement") @GetMapping("/bookCarAgreement")
public AjaxResult bookCarAgreement(OrderInfoDto orderInfoDto, Map<String, String> replacements) throws ParseException, IOException { public AjaxResult bookCarAgreement(OrderInfoDto orderInfoDto, Map<String, String> replacements) throws ParseException, IOException {
if (orderInfoDto != null) { if (orderInfoDto != null) {
@ -320,10 +320,10 @@ public class OrderController extends BaseController {
} else { } else {
return AjaxResult.error("参数错误"); return AjaxResult.error("参数错误");
} }
}*/ }
@ApiOperation(value = "租赁协议(查看)") /* @ApiOperation(value = "租赁协议(查看)-富文本方式")
@GetMapping("/leaseAgreement") @GetMapping("/leaseAgreement")
public AjaxResult getleaseAgreement(String orderId, Map<String, String> replacements) throws ParseException { public AjaxResult getleaseAgreement(String orderId, Map<String, String> replacements) throws ParseException {
OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId);
@ -364,9 +364,9 @@ public class OrderController extends BaseController {
StrSubstitutor sub = new StrSubstitutor(replacements); StrSubstitutor sub = new StrSubstitutor(replacements);
String result = sub.replace(bmContract.getContent()); String result = sub.replace(bmContract.getContent());
return AjaxResult.success(result); return AjaxResult.success(result);
} }*/
@ApiOperation(value = "购物车协议(查看)") /* @ApiOperation(value = "购物车协议(查看)-富文本方式")
@PostMapping("/bookCarAgreement") @PostMapping("/bookCarAgreement")
public AjaxResult getbookCarAgreement(@RequestBody OrderInfoDto orderInfoDto) throws ParseException { public AjaxResult getbookCarAgreement(@RequestBody OrderInfoDto orderInfoDto) throws ParseException {
if (orderInfoDto != null) { if (orderInfoDto != null) {
@ -406,5 +406,5 @@ public class OrderController extends BaseController {
} else { } else {
return AjaxResult.error("参数错误"); return AjaxResult.error("参数错误");
} }
} }*/
} }