扫码付款订单 过期

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java

@@ -143,7 +143,7 @@ public class AShopUserServiceImpl implements AShopUserService {
         List<ShopUserDTO> dtoList = shopUserMapper.selectPageByKeyAndIsVip(mainIdByShopId, isVip, key, null);
 
         // 将 dtoList 转换为 ShopUserExportDTO 列表
-        List<ShopUserExportDTO> exportList =  BeanUtil.copyToList(dtoList, ShopUserExportDTO.class);
+        List<ShopUserExportDTO> exportList = BeanUtil.copyToList(dtoList, ShopUserExportDTO.class);
         ExcelExportUtil.exportToResponse(exportList, ShopUserExportDTO.class, shopInfo == null ? "店铺用户列表" : shopInfo.getShopName() + "_用户列表", response);
     }
 
@@ -193,7 +193,15 @@ public class AShopUserServiceImpl implements AShopUserService {
     @Override
     public ShopUser getDetail(Integer id, Integer userId) {
         Long mainId = shopInfoService.getMainIdByShopId(StpKit.USER.getShopId());
-        ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getMainShopId, mainId).eq(ShopUser::getId, id).eq(ShopUser::getUserId, userId));
+        ShopUser shopUser;
+        if (id == null) {
+            shopUser = shopUserService.getShopUserInfo(StpKit.USER.getShopId(), userId);
+        } else {
+            shopUser = shopUserService.getById(id);
+            if (shopUser == null) {
+                throw new CzgException("用户不存在");
+            }
+        }
         long count = couponRecordService.count(new QueryWrapper()
                 .eq(MkShopCouponRecord::getShopUserId, shopUser.getId())
                 .eq(MkShopCouponRecord::getStatus, 0)

cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java

@@ -484,8 +484,8 @@ public interface PrinterImpl {
      * @param pickupNumber 取餐号
      * @return 元数据
      */
-    default String buildOnlyKitchenPrintData(String pickupNumber, OrderDetail orderDetail) {
+    default String buildOnlyKitchenPrintData(Integer isCode, String pickupNumber, OrderDetail orderDetail) {
-        PrintSignLabel signLabelInfo = getSignLabelInfo();
+        PrintLabel signLabelInfo = getSignLabelInfo();
         StringBuilder builder = new StringBuilder();
         builder.append(formatLabel(pickupNumber, signLabelInfo.centerBold))
                 .append(signLabelInfo.br);

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java

@@ -1419,7 +1419,9 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
         param.setWaitCall(false);
         param.setVipPrice(false);
         param.setPackFee(BigDecimal.ZERO);
-        return initOrderInfo(param, shopInfo, null);
+        OrderInfo orderInfo = initOrderInfo(param, shopInfo, null);
+        redisService.set(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId(), "", 60 * 15);
+        return orderInfo;
     }
 
     /**