zianxin/biz-api-cloud-zax
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
dzc committed 2026-06-08 19:28:28 +08:00
1 parent 4cb7103a18
commit 69a0228549
3 files changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/xfj/HardXfjLogController.java
+10 -10
View File
@@ -18,19 +18,19 @@ import org.springframework.web.bind.annotation.*;
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/xfj-log" )
@Tag(description = "xfj-log" , name = "消费机日志管理" )
@RequestMapping("/xfj-log")
@Tag(description = "xfj-log", name = "消费机日志管理")
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class HardXfjLogController {
private final HardXfjLogService hardXfjLogService;
private final HardXfjLogService hardXfjLogService;
/**
* 分页查询
*/
@Operation(summary = "分页查询" , description = "分页查询" )
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('hard_hardXfjLog_view')" )
@Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('hard_hardXfjLog_view')")
public R getHardXfjLogPage(@ParameterObject Page page, @ParameterObject HardXfjLogDto dto) {
return R.ok(hardXfjLogService.pageList(page, dto));
}
@@ -38,10 +38,10 @@ public class HardXfjLogController {
/**
* 通过id查询消费机日志
*/
@Operation(summary = "通过id查询" , description = "通过id查询" )
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('hard_hardXfjLog_view')" )
public R getById(@PathVariable("id" ) Long id) {
@Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}")
@PreAuthorize("@pms.hasPermission('hard_hardXfjLog_view')")
public R getById(@PathVariable("id") Long id) {
return R.ok(hardXfjLogService.getById(id));
}
pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+1 -1
View File
@@ -445,7 +445,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
redisTemplate.opsForValue().set(redisKey, String.valueOf(orderObj.getId()), 300, TimeUnit.SECONDS);
// String qrCodeData = String.format("http://192.168.101.173:8889/h5/#/pages/pay/scanPay?action=harQrCodeScanPay&orderId=%s&mchId=%s", orderObj.getId(), orderObj.getMerchantId());
String qrCodeData = String.format("https://stgl.pj.gov.cn/h5/#/pages/pay/scanPay?action=harQrCodeScanPay&orderId=%s&mchId=%s", orderObj.getId(), orderObj.getMerchantId());
String qrCodeData = String.format("https://stgl.pj.gov.cn/h5/#/pages/pay/scan-pay?action=harQrCodeScanPay&orderId=%s&mchId=%s", orderObj.getId(), orderObj.getMerchantId());
return HardCreateHardQrCodeScanOrderVo.builder().orderId(orderObj.getId()).mchId(orderObj.getMerchantId()).qrCodeData(qrCodeData).build();
}
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchManageServiceImpl.java
+1 -1
View File
@@ -493,7 +493,7 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
// 生成url二维码
private String generateUrlQrCode(MchManageEntity mchDetail) {
String url = String.format("https://stgl.pj.gov.cn/h5/#/pages/pay/scanPay?id=%s", mchDetail.getId());
String url = String.format("https://stgl.pj.gov.cn/h5/#/pages/pay/scan-pay?id=%s", mchDetail.getId());
String fileName = String.format("%s-%s.png", mchDetail.getId(), System.currentTimeMillis());
try {
Drawing2D drawing = new Drawing2D();