mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBookingService.java

@@ -8,33 +8,10 @@
 
 package com.suisung.mall.shop.order.service;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.suisung.mall.common.modules.order.ShopOrderBooking;
 import com.suisung.mall.core.web.service.IBaseService;
 
 public interface ShopOrderBookingService extends IBaseService<ShopOrderBooking> {
 
-    /**
-     * 添加或更新预约订单任务
-     * @param shopOrderBooking 预约订单任务信息
-     * @return 操作后的预约订单任务实例
-     */
-    ShopOrderBooking addOrUpdate(ShopOrderBooking shopOrderBooking);
 
-    /**
+}
-     * 查询有效的预约订单任务分页列表（按预约时间升序排序）
-     * @param pageNum 页码
-     * @param pageSize 页大小
-     * @return 分页结果
-     */
-    Page<ShopOrderBooking> findValidBookingList(Integer pageNum, Integer pageSize);
-
-    /**
-     * 更新预约订单任务
-     * @param updateWrapper 更新条件包装器
-     * @return 是否更新成功
-     */
-    boolean update(UpdateWrapper<ShopOrderBooking> updateWrapper);
-
-}

mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java

@@ -6644,7 +6644,9 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                     }
 
                     info_row.setActivity_json(JSONUtil.toJsonStr(store_item.get("discount_detail_rows")));
+
                     info_row.setPayment_form_id(payment_form_id);
+
                     UserDto user = getCurrentUser();
                     if (ObjectUtil.isNotEmpty(user) && user.isChain()) {
                         info_row.setChain_id(Convert.toInt(user.getChain_id()));

mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBookingServiceImpl.java

@@ -8,10 +8,6 @@
 
 package com.suisung.mall.shop.order.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.suisung.mall.common.constant.CommonConstant;
 import com.suisung.mall.common.modules.order.ShopOrderBooking;
 import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
 import com.suisung.mall.shop.order.mapper.ShopOrderBookingMapper;
@@ -23,65 +19,4 @@ import org.springframework.stereotype.Service;
 @Service
 public class ShopOrderBookingServiceImpl extends BaseServiceImpl<ShopOrderBookingMapper, ShopOrderBooking> implements ShopOrderBookingService {
 
-    @Override
+}
-    public ShopOrderBooking addOrUpdate(ShopOrderBooking shopOrderBooking) {
-        log.debug("添加或更新预约订单任务: {}", shopOrderBooking);
-        if (shopOrderBooking == null) {
-            log.warn("预约订单任务信息为空");
-            return null;
-        }
-
-        if (shopOrderBooking.getId() != null && shopOrderBooking.getId() > 0) {
-            // 更新操作
-            log.debug("执行更新操作，ID: {}", shopOrderBooking.getId());
-            this.updateById(shopOrderBooking);
-            return shopOrderBooking;
-        } else {
-            // 添加操作
-            log.debug("执行添加操作");
-            boolean saved = this.save(shopOrderBooking);
-            if (saved) {
-                return shopOrderBooking;
-            } else {
-                log.error("保存预约订单任务失败: {}", shopOrderBooking);
-                return null;
-            }
-        }
-    }
-
-    @Override
-    public Page<ShopOrderBooking> findValidBookingList(Integer pageNum, Integer pageSize) {
-        log.debug("查询有效的预约订单任务分页列表，页码: {}，页大小: {}", pageNum, pageSize);
-        if (pageNum == null || pageNum <= 0) {
-            log.warn("页码无效，使用默认值 1");
-            pageNum = 1;
-        }
-        if (pageSize == null || pageSize <= 0) {
-            log.warn("页大小无效，使用默认值 10");
-            pageSize = 10;
-        }
-
-        Page<ShopOrderBooking> page = new Page<>(pageNum, pageSize);
-        QueryWrapper<ShopOrderBooking> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("status", CommonConstant.Enable);
-        queryWrapper.orderByAsc("booking_at");
-        return this.page(page, queryWrapper);
-    }
-
-    @Override
-    public boolean update(UpdateWrapper<ShopOrderBooking> updateWrapper) {
-        log.debug("更新预约订单任务");
-        if (updateWrapper == null) {
-            log.warn("更新条件不能为空");
-            return false;
-        }
-
-        try {
-            return this.update(updateWrapper);
-        } catch (Exception e) {
-            log.error("更新预约订单任务时发生异常", e);
-            return false;
-        }
-    }
-
-}