From 4cb7103a18983993d7b7f65d751297dd2ee09247 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 8 Jun 2026 16:40:38 +0800 Subject: [PATCH] 11 --- .../hard/api/dto/hard/HandCancelCodeDto.java | 1 - .../hard/controller/HardApptController.java | 3 +- .../impl/order/HardOrderServiceImpl.java | 17 ++- .../service/impl/xfj/HardXfjServiceImpl.java | 104 ++++++++++++------ .../2026-02/debug.2026-02-10.1.log.gz | Bin 0 -> 26704 bytes .../controller/mch/MchManageController.java | 7 +- .../wallet/mapper/MchManageMapper.java | 1 + 7 files changed, 91 insertions(+), 42 deletions(-) create mode 100644 pjcloud-thirdparty/pjcloud-thirdparty-biz/logs/pjcloud-thirdparty-biz/2026-02/debug.2026-02-10.1.log.gz diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/hard/HandCancelCodeDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/hard/HandCancelCodeDto.java index ca49cb193..2499bd510 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/hard/HandCancelCodeDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/hard/HandCancelCodeDto.java @@ -15,7 +15,6 @@ public class HandCancelCodeDto { private Long hardwareId; @Schema(description = "安卓订单code") - @NotNull(message = "安卓订单code不能为空") private String androidOrderCode; @Schema(description = "用户id") diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardApptController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardApptController.java index d3fb7b578..9a06d8a7e 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardApptController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardApptController.java @@ -41,8 +41,9 @@ public class HardApptController { @Operation(summary = "app预约时间列表", description = "app预约时间列表") @GetMapping("/app/list") - public R> appList() { + public R> appList(@ParameterObject HardApptDto dto) { List list = hardApptService.list(new LambdaQueryWrapper() + .eq(ObjectUtil.isNotEmpty(dto.getMchId()), HardApptEntity::getMchId, dto.getMchId()) .eq(HardApptEntity::getStatus, YesNoEnum.YES.getCode()) .orderByDesc(HardApptEntity::getSort) ); diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java index 57ed5d7f1..eaf97eb95 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java @@ -545,7 +545,7 @@ public class HardOrderServiceImpl extends ServiceImpl 0; } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/xfj/HardXfjServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/xfj/HardXfjServiceImpl.java index 5473aafe2..52a8839de 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/xfj/HardXfjServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/xfj/HardXfjServiceImpl.java @@ -12,6 +12,7 @@ import com.bsd.pjcloud.common.core.constant.CacheConstants; import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum; import com.bsd.pjcloud.hard.api.constant.HardTypeEnum; import com.bsd.pjcloud.hard.api.constant.xfj.HardXfjTypeEnum; +import com.bsd.pjcloud.hard.api.dto.hard.HandCancelCodeDto; import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto; import com.bsd.pjcloud.hard.api.dto.order.xfj.HardXfjFastCreateOrderDto; import com.bsd.pjcloud.hard.api.dto.xfj.*; @@ -37,6 +38,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.math.BigDecimal; @@ -210,6 +212,7 @@ public class HardXfjServiceImpl implements HardXfjService { payDto.setOrderNo(dto.getOrder()); payDto.setWalletType(WalletTypeEnum.EAT); payDto.setXfjPayType(HardXfjTypeEnum.CARD_PAY); + payDto.setPlatformType(AppPlusPlatformTypeEnum.ZAX_APP_WALLET); Long orderId = hardOrderService.xfjFastCreateOrder(payDto); result.setName(username); @@ -542,6 +545,7 @@ public class HardXfjServiceImpl implements HardXfjService { * 付款码(二维码)支付接口 */ @Override + @Transactional public XfjQRCodeTransactionVo qrCodeTransaction(String body, Map headers) { HardXfjLogEntity logger = initLogger(body, headers, "付款码(二维码)支付接口"); XfjQRCodeTransactionVo result = new XfjQRCodeTransactionVo(); @@ -555,16 +559,8 @@ public class HardXfjServiceImpl implements HardXfjService { } // 扣费 if (ObjectUtil.equals(dto.getMode(), "0")) { - // `QR`有三种可能性1、微信、支付宝、短码 - AppPlusPlatformTypeEnum platformType = judgeQrCode(dto.getQR()); - if (ObjectUtil.isEmpty(platformType)) { - throw new RuntimeException("二维码解析错误"); - } - Long userId = null; - WalletTypeEnum walletType = null; - HardXfjTypeEnum xfjPayType = HardXfjTypeEnum.QRCODE_PAY; - if (ObjectUtil.equals(platformType, AppPlusPlatformTypeEnum.ZAX_APP_WALLET)) { - walletType = WalletTypeEnum.EAT; + // 取餐 + if (ObjectUtil.equals(dto.getPayType(), 3)) { // 传过来的是`短码`需要解析一下 WalletCodeUseEntity data = remoteCodeUseService.getInfoByShortCode(dto.getQR()).getData(); if (ObjectUtil.isEmpty(data)) { @@ -572,27 +568,70 @@ public class HardXfjServiceImpl implements HardXfjService { result.setMsg("二维码错误"); return result; } - userId = data.getUserId(); - } else if (ObjectUtil.equals(platformType, AppPlusPlatformTypeEnum.WECHAT)) { - xfjPayType = HardXfjTypeEnum.WECHAT_QRCODE_PAY; - } else if (ObjectUtil.equals(platformType, AppPlusPlatformTypeEnum.ALI_PAY)) { - xfjPayType = HardXfjTypeEnum.ALI_QRCODE_PAY; + if (ObjectUtil.isEmpty(data.getId())) { + result.setStatus(XfjBaseVo.STATUS_FAIL); + result.setMsg("不是定餐二维码"); + return result; + } + // 查询订单 + HardOrderEntity order = hardOrderService.getById(data.getBizId()); + if (ObjectUtil.isEmpty(order)) { + result.setStatus(XfjBaseVo.STATUS_FAIL); + result.setMsg("定餐订单不存在"); + return result; + } + HandCancelCodeDto cancelDto = new HandCancelCodeDto(); + cancelDto.setOrderId(order.getId()); + cancelDto.setHardwareId(entity.getId()); + cancelDto.setUserId(order.getUserId()); + Boolean isCancel = hardOrderService.handCancelCode(cancelDto); + if (!isCancel) { + result.setStatus(XfjBaseVo.STATUS_FAIL); + result.setMsg("核销订餐失败"); + return result; + } + result.setQrorder(String.valueOf(order.getId())); + return result; + } else { + // `QR`有三种可能性1、微信、支付宝、短码 + AppPlusPlatformTypeEnum platformType = judgeQrCode(dto.getQR()); + if (ObjectUtil.isEmpty(platformType)) { + throw new RuntimeException("二维码解析错误"); + } + Long userId = null; + WalletTypeEnum walletType = null; + HardXfjTypeEnum xfjPayType = HardXfjTypeEnum.QRCODE_PAY; + if (ObjectUtil.equals(platformType, AppPlusPlatformTypeEnum.ZAX_APP_WALLET)) { + walletType = WalletTypeEnum.EAT; + // 传过来的是`短码`需要解析一下 + WalletCodeUseEntity data = remoteCodeUseService.getInfoByShortCode(dto.getQR()).getData(); + if (ObjectUtil.isEmpty(data)) { + result.setStatus(XfjBaseVo.STATUS_FAIL); + result.setMsg("二维码错误"); + return result; + } + userId = data.getUserId(); + } else if (ObjectUtil.equals(platformType, AppPlusPlatformTypeEnum.WECHAT)) { + xfjPayType = HardXfjTypeEnum.WECHAT_QRCODE_PAY; + } else if (ObjectUtil.equals(platformType, AppPlusPlatformTypeEnum.ALI_PAY)) { + xfjPayType = HardXfjTypeEnum.ALI_QRCODE_PAY; + } + + // 解析金额 + int price = BigDecimal.valueOf(Double.valueOf(dto.getAmount())).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).intValue(); + + HardXfjFastCreateOrderDto payDto = new HardXfjFastCreateOrderDto(); + payDto.setUserId(userId); + payDto.setHardId(entity.getId()); + payDto.setPrice(price); + payDto.setWalletType(walletType); + payDto.setXfjPayType(xfjPayType); + payDto.setPlatformType(platformType); + payDto.setDevicePayCode(dto.getQR()); + Long orderId = hardOrderService.xfjFastCreateOrder(payDto); + result.setQrorder(String.valueOf(orderId)); + return result; } - - // 解析金额 - int price = BigDecimal.valueOf(Double.valueOf(dto.getAmount())).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).intValue(); - - HardXfjFastCreateOrderDto payDto = new HardXfjFastCreateOrderDto(); - payDto.setUserId(userId); - payDto.setHardId(entity.getId()); - payDto.setPrice(price); - payDto.setWalletType(walletType); - payDto.setXfjPayType(xfjPayType); - payDto.setPlatformType(platformType); - payDto.setDevicePayCode(dto.getQR()); - Long orderId = hardOrderService.xfjFastCreateOrder(payDto); - result.setQrorder(String.valueOf(orderId)); - return result; } // 充值 else if (ObjectUtil.equals(dto.getMode(), "1")) { @@ -785,8 +824,9 @@ public class HardXfjServiceImpl implements HardXfjService { redisTemplate.opsForValue().set(lockKey, "1", Duration.ofMinutes(30)); log.info("|获取卡号白名单接口|设备 {} 查询完成，设置30分钟锁", entity.getUniqueCode()); } - for (WalletActiveEntity item : walletActiveRecords) { - String whiteCarNumber = generateWhiteCarNumber(String.valueOf(item.getCardSort()), item.getCardNumber(), ObjectUtil.equals(item.getDelFlag(), YesNoEnum.YES.getCode()) ? "0" : "1"); + for (int i = 0; i < walletActiveRecords.size(); i++) { + WalletActiveEntity traget = walletActiveRecords.get(i); + String whiteCarNumber = generateWhiteCarNumber(String.valueOf(i + 1), traget.getCardNumber(), ObjectUtil.equals(traget.getDelFlag(), YesNoEnum.YES.getCode()) ? "0" : "1"); whiteCarList.add(whiteCarNumber); } result.setCommID(dto.getCommID()); diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/logs/pjcloud-thirdparty-biz/2026-02/debug.2026-02-10.1.log.gz b/pjcloud-thirdparty/pjcloud-thirdparty-biz/logs/pjcloud-thirdparty-biz/2026-02/debug.2026-02-10.1.log.gz new file mode 100644 index 0000000000000000000000000000000000000000..ab3d86db19a7d59fc7177879d8d1e8b11c4ecb7a GIT binary patch literal 26704 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 pageList = remoteDeptService.getDescendantList(userInfo.getSysUser().getDeptId()).getData(); - if (ObjectUtil.isNotEmpty(pageList)) { - List deptList = pageList.stream().map(SysDept::getDeptId).distinct().toList(); - dto.setDeptIds(deptList); + MchManageVo targetMch = mchManageService.getViewsCanteenMchByDeptId(userInfo.getSysUser().getDeptId()); + if (ObjectUtil.isNotEmpty(targetMch)) { + dto.setIds(List.of(targetMch.getId())); } } else { R.ok(new Page<>()); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java index 3372d351c..f4188692e 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java @@ -30,6 +30,7 @@ public interface MchManageMapper extends PjcloudBaseMapper { .eq(dto.getParentIsNull(), MchManageEntity::getParentId, -1L) .likeIfExists(MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) + .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()) .apply(ObjectUtil.isNotEmpty(dto.getType()), "FIND_IN_SET({0}, types)", dto.getType()) .orderByDesc(MchManageEntity::getSort) .orderByDesc(MchManageEntity::getCreateTime)