zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:线上链接

Browse Source
This commit is contained in:
dzc committed 2025-09-21 19:41:45 +08:00
1 parent 14e759f5e6
commit d41155b6a1
1 file changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files
pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+3 -4
View File
@@ -417,13 +417,12 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
orderObj.setUserId(-1L);
baseMapper.insert(orderObj);
// String qrCodeData = String.format("https://stgl.pj.gov.cn/h5/#/pages/pay/scanPay?action=harQrCodeScanPay&orderId=%s&mchId=%s", orderObj.getId(), orderObj.getMerchantId());
// 在redis里存储订单id如果5分钟没有支付就删除订单
String redisKey = String.format("%s:%s", CacheConstants.HARDER_ORDER_NON_PAY, orderObj.getId());
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("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());
return HardCreateHardQrCodeScanOrderVo.builder().orderId(orderObj.getId()).mchId(orderObj.getMerchantId()).qrCodeData(qrCodeData).build();
}
@@ -715,7 +714,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
}
MchManageVo cancelUserMch = remoteMchService.getFirstMch(List.of(cancelUserDetail.getSysUser().getDeptId()), MerchantTypeEnum.SUPERMARKET).getData();
if(ObjectUtil.isEmpty(cancelUserMch) || ObjectUtil.notEqual(cancelUserMch.getId(), actDetail.getMchId())){
if (ObjectUtil.isEmpty(cancelUserMch) || ObjectUtil.notEqual(cancelUserMch.getId(), actDetail.getMchId())) {
throw new RuntimeException("当前活动,该用户没有核销权限");
}