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

Compare commits

base: bonus:4cb93fa2457ed4cc299dc6d08b98a2c0e0a35711
Branches Tags
bonus:master
bonus:ah-simple
bonus:gz-simple
bonus:sx-simple
bonus:ah-simple-old
bonus:matype1211
bonus:maprop1210
..
compare: bonus:06ff503f875b2c9eeca951c286bbff81ab2a754d
Branches Tags
bonus:ah-simple
bonus:gz-simple
bonus:sx-simple
bonus:ah-simple-old
bonus:master
bonus:matype1211
bonus:maprop1210

No commits in common. "4cb93fa2457ed4cc299dc6d08b98a2c0e0a35711" and "06ff503f875b2c9eeca951c286bbff81ab2a754d" have entirely different histories.
4cb93fa245 ... 06ff503f87

1 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

@ -175,7 +175,7 @@ public class OrderController extends BaseController {
} }
} }
@ApiOperation(value = "租赁协议(查看)-word方式") /* @ApiOperation(value = "租赁协议(查看)")
@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);
@ -241,9 +241,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 = "购物车协议(查看)-word方式") /* @ApiOperation(value = "购物车协议(查看)")
@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) {
@ -306,7 +306,7 @@ public class OrderController extends BaseController {
}*/ }*/
/* @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);
@ -347,9 +347,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) {