dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:68dd037dcc601457d7dc6ef777e4571f9169b623
Branches Tags
dianliang:master
dianliang:driver
dianliang:insp
dianliang:repair
dianliang:dev
...
compare: dianliang:c7d0f6e70725cab3af2b9b92207d9b44a7aebd28
Branches Tags
dianliang:driver
dianliang:insp
dianliang:master
dianliang:repair
dianliang:dev

3 Commits
68dd037dcc ... c7d0f6e707

Author SHA1 Message Date
xiaofajia
c7d0f6e707 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-30 18:08:09 +08:00
xiaofajia
fd3b9c0aec 打印工单 完成 2024-10-30 18:07:27 +08:00
xiaofajia
c1cf26a98c 打印工单 2024-10-30 17:48:27 +08:00
2 changed files with 21 additions and 11 deletions
Show Stats Expand all files Collapse all files

2
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
View File

@ -111,6 +111,6 @@ public class RepairOrderInfoController {
@GetMapping("/toPay")
@Operation(summary = "PC支付按钮")
public CommonResult<?> toPay(@RequestParam("id")String id) throws IOException, NoSuchAlgorithmException, SignatureException, InvalidKeyException {
return success(repairOrderInfoService.payTransactions(id));
return success(repairOrderInfoService.payTransactionsCode(id));
}
}

30
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -743,20 +743,20 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
params.put("bankAddress", bankAddress);
params.put("account", account);
// 调支付接口 todo 这个地方应该还要加东西
// 调支付接口
String payUrl = "";
try {
Map<String, Object> stringObjectMap = repairOrderInfoService.payTransactions(orderInfo.getId());
payUrl = (String) stringObjectMap.get("prepay_id");
Map<String, Object> stringObjectMap = repairOrderInfoService.payTransactionsCode(orderInfo.getId());
payUrl = (String) stringObjectMap.get("code_url");
// 这个地方可能报错，报错就不生成二维码了，保证工单是能出来的
// 生成收款二维码
int width = 100, height = 100;
byte[] texts = CreateQRCodeUtil.GenerateQRCode(payUrl, width, height);
if (ObjectUtil.isNotEmpty(texts)){
params.put("qrCode", new PictureRenderData(width, height, PictureType.PNG, texts));
}
}catch (Exception e){
e.printStackTrace();
throw exception0(500, "系统异常");
}
// 生成收款二维码
int width = 100, height = 100;
byte[] texts = CreateQRCodeUtil.GenerateQRCode(payUrl, width, height);
if (ObjectUtil.isNotEmpty(texts)){
params.put("qrCode", new PictureRenderData(width, height, PictureType.PNG, texts));
}
Configure config = configureBuilder.build();
@ -1357,6 +1357,16 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
BigDecimal confirmFaultMoney = ObjectUtil.isNotEmpty(oldTicket.getConfirmFaultMoney()) ? oldTicket.getConfirmFaultMoney() : new BigDecimal("0");
tickets.setTotalPrice(tickets.getTotalPrice().add(managerMoney).add(rescueMoney).add(threePackMoney).add(confirmFaultMoney));
// 因为订单是在工单创建的时候就新增了，后面加的配件之类的金额没有同步到订单，这里同步一下
RepairOrderInfo orderInfo = repairOrderInfoService.getOne(new LambdaQueryWrapper<RepairOrderInfo>().eq(RepairOrderInfo::getGoodsId, ticketId));
RepairOrderInfo newOrderInfo = new RepairOrderInfo();
newOrderInfo.setId(orderInfo.getId());
// 更新商品原价和实付金额
newOrderInfo.setGoodsPrice(tickets.getTotalPrice());
newOrderInfo.setPayMoney(tickets.getTotalPrice());
repairOrderInfoService.updateById(newOrderInfo);
return baseMapper.updateById(tickets) > 0;
}