From 6c4458113e1b818c1d0a3591407a45935e986524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 26 Nov 2025 15:41:04 +0800 Subject: [PATCH] =?UTF-8?q?orderinfo=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/task/BirthdayGiftTask.java | 7 - .../java/com/czg/task/DistributionTask.java | 4 +- .../main/java/com/czg/task/MemberTask.java | 2 +- .../config/RedisKeyExpirationListener.java | 4 +- .../com/czg/controller/NotifyController.java | 6 +- .../czg/controller/OrderPayController.java | 5 +- .../admin/AdminOrderController.java | 4 +- .../controller/user/UserOrderController.java | 4 +- .../main/java/com/czg/mq/OrderMqListener.java | 6 +- .../main/java/com/czg/mq/PrintMqListener.java | 11 -- .../src/main/java/com/czg/task/OTimeTask.java | 4 +- .../czg/market/service/OrderInfoService.java | 7 + ...rvice.java => OrderInfoCustomService.java} | 2 +- .../service/impl/AShopUserServiceImpl.java | 2 +- .../service/impl/UShopUserServiceImpl.java | 2 +- .../market}/mapper/OrderInfoMapper.java | 7 +- .../service/impl/MemberOrderServiceImpl.java | 5 +- .../impl/MkConsumeCashbackServiceImpl.java | 4 +- .../impl/MkDistributionUserServiceImpl.java | 4 +- ...kShopConsumeDiscountRecordServiceImpl.java | 4 +- .../service/impl/OrderInfoServiceImpl.java | 13 ++ .../service/impl/ShopCouponServiceImpl.java | 4 +- .../impl/TbMemberConfigServiceImpl.java | 4 +- .../main/resources/mapper/OrderInfoMapper.xml | 13 +- .../order/mapper/OrderInfoCustomMapper.java | 143 +++++++++++++++ .../service/order/print/PrinterHandler.java | 2 +- .../impl/CreditBuyerOrderServiceImpl.java | 4 +- ...l.java => OrderInfoCustomServiceImpl.java} | 12 +- .../service/impl/OrderInfoRpcServiceImpl.java | 2 +- .../order/service/impl/PayServiceImpl.java | 5 +- .../mapper/OrderInfoCustomMapper.xml | 171 ++++++++++++++++++ 31 files changed, 392 insertions(+), 75 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/service/OrderInfoService.java rename cash-common/cash-common-service/src/main/java/com/czg/order/service/{OrderInfoService.java => OrderInfoCustomService.java} (97%) rename cash-service/{order-service/src/main/java/com/czg/service/order => market-service/src/main/java/com/czg/service/market}/mapper/OrderInfoMapper.java (98%) create mode 100644 cash-service/market-service/src/main/java/com/czg/service/market/service/impl/OrderInfoServiceImpl.java rename cash-service/{order-service => market-service}/src/main/resources/mapper/OrderInfoMapper.xml (95%) create mode 100644 cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoCustomMapper.java rename cash-service/order-service/src/main/java/com/czg/service/order/service/impl/{OrderInfoServiceImpl.java => OrderInfoCustomServiceImpl.java} (99%) create mode 100644 cash-service/order-service/src/main/resources/mapper/OrderInfoCustomMapper.xml diff --git a/cash-api/market-server/src/main/java/com/czg/task/BirthdayGiftTask.java b/cash-api/market-server/src/main/java/com/czg/task/BirthdayGiftTask.java index 7e4852129..f90b34ed4 100644 --- a/cash-api/market-server/src/main/java/com/czg/task/BirthdayGiftTask.java +++ b/cash-api/market-server/src/main/java/com/czg/task/BirthdayGiftTask.java @@ -1,21 +1,14 @@ package com.czg.task; -import cn.hutool.core.date.DateUtil; import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopUserService; -import com.czg.constant.TableValueConstant; import com.czg.market.service.MkBirthdayGiftService; -import com.czg.market.service.TbMemberConfigService; -import com.czg.order.service.OrderInfoService; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.List; - /** * 生日有礼奖励发放 * diff --git a/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java b/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java index cbc25844b..2dfd2bbdb 100644 --- a/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java +++ b/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java @@ -9,8 +9,8 @@ import com.czg.constant.TableValueConstant; import com.czg.market.entity.MkDistributionFlow; import com.czg.market.service.MkDistributionFlowService; import com.czg.market.service.MkDistributionUserService; +import com.czg.market.service.OrderInfoService; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; import com.czg.service.market.enums.OrderStatusEnums; import com.czg.utils.FunUtils; import com.mybatisflex.core.query.QueryWrapper; @@ -35,7 +35,7 @@ public class DistributionTask { @Resource private MkDistributionFlowService distributionFlowService; - @DubboReference + @Resource private OrderInfoService orderInfoService; @DubboReference private ShopInfoService shopInfoService; diff --git a/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java index 8ddcb14cb..d96142076 100644 --- a/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java +++ b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java @@ -4,9 +4,9 @@ import cn.hutool.core.date.DateUtil; import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopUserService; import com.czg.constant.TableValueConstant; +import com.czg.market.service.OrderInfoService; import com.czg.market.service.TbMemberConfigService; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import lombok.Data; diff --git a/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java b/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java index 18640f965..0e049784b 100644 --- a/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java +++ b/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java @@ -5,7 +5,7 @@ import com.czg.market.entity.MkShopCouponRecord; import com.czg.market.service.AcPushEventService; import com.czg.market.service.MkShopCouponRecordService; import com.czg.market.service.SmsPushEventService; -import com.czg.order.service.OrderInfoService; +import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -31,7 +31,7 @@ public class RedisKeyExpirationListener implements MessageListener { @Value("${spring.data.redis.database}") private String database; @Resource - private OrderInfoService orderInfoService; + private OrderInfoCustomServiceImpl orderInfoService; @DubboReference private ShopTableService tableService; @Resource diff --git a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java index 318f886ae..d534eb1f5 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java @@ -4,22 +4,20 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; import com.alibaba.fastjson2.JSONObject; import com.czg.CzgPayUtils; -import com.czg.account.service.ShopInfoService; import com.czg.entity.CzgBaseRespParams; import com.czg.market.entity.MkShopConsumeDiscountRecord; import com.czg.market.service.MkDistributionUserService; import com.czg.market.service.MkShopConsumeDiscountRecordService; import com.czg.order.entity.OrderInfo; import com.czg.order.entity.OrderPayment; -import com.czg.order.service.OrderInfoService; import com.czg.order.service.OrderPaymentService; import com.czg.service.market.service.impl.AppWxServiceImpl; +import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl; import com.czg.utils.AssertUtil; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -39,7 +37,7 @@ public class NotifyController { private static final String SUCCESS = "SUCCESS"; @Resource - private OrderInfoService orderInfoService; + private OrderInfoCustomServiceImpl orderInfoService; @Resource private AppWxServiceImpl wxService; diff --git a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java index 9974a924f..75ea6f639 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java @@ -5,10 +5,11 @@ import cn.hutool.core.util.URLUtil; import com.czg.annotation.Debounce; import com.czg.order.dto.CheckOrderPay; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; +import com.czg.order.service.OrderInfoCustomService; import com.czg.resp.CzgResult; import com.czg.service.order.dto.OrderPayParamDTO; import com.czg.service.order.service.PayService; +import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl; import com.czg.system.enums.SysParamCodeEnum; import com.czg.system.service.SysParamsService; import com.czg.utils.AssertUtil; @@ -36,7 +37,7 @@ public class OrderPayController { @Resource private PayService payService; @Resource - private OrderInfoService orderInfoService; + private OrderInfoCustomServiceImpl orderInfoService; @DubboReference private SysParamsService paramsService; diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java index 4b780d53f..55ac588c1 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java @@ -5,7 +5,7 @@ import com.czg.annotation.SaStaffCheckPermission; import com.czg.config.RabbitPublisher; import com.czg.order.dto.*; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; +import com.czg.order.service.OrderInfoCustomService; import com.czg.order.vo.HistoryOrderPrintVo; import com.czg.order.vo.HistoryOrderVo; import com.czg.order.vo.OrderInfoVo; @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.*; public class AdminOrderController { @Resource - private OrderInfoService orderInfoService; + private OrderInfoCustomService orderInfoService; @Resource private PayService payService; @Resource diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java index 51622981c..e7271111e 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java @@ -9,12 +9,12 @@ import com.czg.order.dto.OrderInfoQueryDTO; import com.czg.market.entity.MemberOrder; import com.czg.order.entity.OrderInfo; import com.czg.market.service.MemberOrderService; -import com.czg.order.service.OrderInfoService; import com.czg.order.vo.HistoryOrderVo; import com.czg.order.vo.OrderInfoVo; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.czg.service.order.enums.OrderStatusEnums; +import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl; import com.czg.utils.AssertUtil; import com.czg.utils.ServletUtil; import com.mybatisflex.core.paginate.Page; @@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*; public class UserOrderController { @Resource - private OrderInfoService orderInfoService; + private OrderInfoCustomServiceImpl orderInfoService; @Resource private MemberOrderService memberOrderService; diff --git a/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java index 4e054ec96..4ad688b5e 100644 --- a/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java +++ b/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java @@ -5,10 +5,12 @@ import cn.hutool.core.exceptions.ExceptionUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.czg.config.RabbitConstants; +import com.czg.market.service.OrderInfoService; import com.czg.order.entity.MqLog; import com.czg.order.service.MqLogService; +import com.czg.order.service.OrderInfoCustomService; import com.czg.order.service.OrderInfoRpcService; -import com.czg.order.service.OrderInfoService; +import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl; import com.czg.service.order.utils.FunUtil; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -29,7 +31,7 @@ public class OrderMqListener { @Resource private MqLogService mqLogService; @Resource - private OrderInfoService orderInfoService; + private OrderInfoCustomServiceImpl orderInfoService; @Resource private FunUtil funUtil; diff --git a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java index 925ed007f..0657298ac 100644 --- a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java +++ b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java @@ -1,31 +1,20 @@ package com.czg.mq; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; -import com.czg.account.entity.PrintMachine; -import com.czg.account.service.PrintMachineService; import com.czg.config.RabbitConstants; import com.czg.config.RedisCst; import com.czg.order.entity.MqLog; -import com.czg.order.entity.OrderInfo; import com.czg.order.service.MqLogService; -import com.czg.order.service.OrderInfoService; import com.czg.service.order.print.PrinterHandler; import com.czg.service.order.utils.FunUtil; -import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; import java.util.function.Consumer; /** diff --git a/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java b/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java index dec946439..4973bfa64 100644 --- a/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java +++ b/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java @@ -2,8 +2,8 @@ package com.czg.task; import cn.hutool.core.date.DateUtil; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; import com.czg.service.order.enums.OrderStatusEnums; +import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; @Component public class OTimeTask { @Resource - private OrderInfoService orderInfoService; + private OrderInfoCustomServiceImpl orderInfoService; /** * order 过期 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/OrderInfoService.java new file mode 100644 index 000000000..02fa8ce4c --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/OrderInfoService.java @@ -0,0 +1,7 @@ +package com.czg.market.service; + +import com.czg.order.entity.OrderInfo; +import com.mybatisflex.core.service.IService; + +public interface OrderInfoService extends IService { +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoCustomService.java similarity index 97% rename from cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java rename to cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoCustomService.java index d6bc3962e..62cdec4d5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoCustomService.java @@ -28,7 +28,7 @@ import java.util.List; * @author ww * @since 2025-02-13 */ -public interface OrderInfoService extends IService { +public interface OrderInfoCustomService { Page getOrderByPage(OrderInfoQueryDTO param); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java index 6967bc7a9..114df43c7 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java @@ -21,7 +21,7 @@ import com.czg.market.service.MkShopCouponRecordService; import com.czg.market.service.TbMemberConfigService; import com.czg.market.vo.MemberConfigVO; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; +import com.czg.market.service.OrderInfoService; import com.czg.sa.StpKit; import com.czg.service.account.mapper.ShopUserMapper; import com.czg.system.entity.SysParams; diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java index 1aa868bb2..4315192d1 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java @@ -16,7 +16,7 @@ import com.czg.market.entity.MkShopCouponRecord; import com.czg.market.service.MkShopCouponRecordService; import com.czg.market.service.TbMemberConfigService; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; +import com.czg.market.service.OrderInfoService; import com.czg.resp.CzgResult; import com.czg.service.RedisService; import com.czg.service.account.mapper.ShopConfigMapper; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/OrderInfoMapper.java similarity index 98% rename from cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java rename to cash-service/market-service/src/main/java/com/czg/service/market/mapper/OrderInfoMapper.java index 6c9ae300e..b6226003e 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/OrderInfoMapper.java @@ -1,9 +1,8 @@ -package com.czg.service.order.mapper; +package com.czg.service.market.mapper; import com.czg.account.vo.HandoverCategoryListVo; import com.czg.account.vo.HandoverProductListVo; import com.czg.order.entity.OrderInfo; -import com.czg.order.vo.OrderDetailPrintVo; import com.mybatisflex.core.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,7 +16,6 @@ import java.util.List; * @since 2025-02-13 */ public interface OrderInfoMapper extends BaseMapper { - /** * 交班现金支付统计 * @@ -141,4 +139,5 @@ public interface OrderInfoMapper extends BaseMapper { int decrMoney(@Param("id") Long id, @Param("amount") BigDecimal amount); int updatePayOrderId(@Param("orderId") Long orderId, @Param("paymentId") Long paymentId, @Param("payType") String payType, @Param("remark") String remark); -} + + } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java index 5c349db3e..80f543161 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java @@ -14,12 +14,12 @@ import com.czg.market.dto.MemberConfigDTO; import com.czg.account.entity.ShopInfo; import com.czg.account.entity.UserInfo; import com.czg.market.entity.table.MemberOrderTableDef; +import com.czg.market.service.OrderInfoService; import com.czg.market.service.TbMemberConfigService; import com.czg.market.vo.MemberConfigVO; import com.czg.exception.CzgException; import com.czg.market.dto.MemberOrderDTO; import com.czg.market.vo.MmberOrderVO; -import com.czg.order.service.OrderInfoService; import com.czg.order.service.OrderPaymentService; import com.czg.sa.StpKit; import com.czg.service.market.enums.OrderStatusEnums; @@ -30,6 +30,7 @@ import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.market.entity.MemberOrder; import com.czg.market.service.MemberOrderService; +import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; @@ -55,7 +56,7 @@ public class MemberOrderServiceImpl extends ServiceImpl implements OrderInfoService { +} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java index d9d47862b..f93c46340 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java @@ -24,7 +24,7 @@ import com.czg.market.service.ShopCouponService; import com.czg.market.vo.ShopCouponPopUp; import com.czg.market.vo.UserCouponVO; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; +import com.czg.market.service.OrderInfoService; import com.czg.product.entity.Product; import com.czg.product.service.ProductService; import com.czg.sa.StpKit; @@ -72,7 +72,7 @@ public class ShopCouponServiceImpl extends ServiceImpl - + AND t1.shop_id = @@ -37,11 +37,11 @@ update tb_order_info set pay_order_id = #{paymentId}, - pay_type = #{payType}, - update_time=now() - - , remark = #{remark} - + pay_type = #{payType}, + update_time=now() + + , remark = #{remark} + where id = #{orderId}; @@ -167,5 +167,4 @@ and t1.pay_type = 'credit_pay' - diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoCustomMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoCustomMapper.java new file mode 100644 index 000000000..5f3e53b03 --- /dev/null +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoCustomMapper.java @@ -0,0 +1,143 @@ +//package com.czg.service.order.mapper; +// +//import com.czg.account.vo.HandoverCategoryListVo; +//import com.czg.account.vo.HandoverProductListVo; +//import com.czg.order.entity.OrderInfo; +//import com.mybatisflex.core.BaseMapper; +//import org.apache.ibatis.annotations.Param; +// +//import java.math.BigDecimal; +//import java.util.List; +// +///** +// * 订单表 映射层。 +// * +// * @author ww +// * @since 2025-02-13 +// */ +//public interface OrderInfoCustomMapper extends BaseMapper { +// +// /** +// * 交班现金支付统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 现金支付总额 +// */ +// BigDecimal getHandoverCashAmount(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班微信支付统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 现金支付总额 +// */ +// BigDecimal getHandoverWechatAmount(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班支付宝支付统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 支付宝支付总额 +// */ +// BigDecimal getHandoverAlipayAmount(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班VIP支付统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return VIP支付总额 +// */ +// BigDecimal getHandoverVipPayAmount(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班VIP充值统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return VIP充值总额 +// */ +// BigDecimal getHandoverVipChargeAmount(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班快捷支付统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 快捷支付总额 +// */ +// BigDecimal getHandoverQuickPayAmount(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班退款统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 退款总额 +// */ +// BigDecimal getHandoverRefundAmount(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班挂账统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 挂账总额 +// */ +// BigDecimal getHandoverCreditAmount(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班营业额统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 营业额 +// */ +// BigDecimal getHandoverTotalAmount(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班订单数统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 交班订单数 +// */ +// int getHandoverOrderNum(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班售出商品明细 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 交班售出商品明细 +// */ +// List getHandoverDetailList(Long shopId, String loginTime, String handoverTime); +// +// /** +// * 交班售出商品分类统计 +// * +// * @param shopId 店铺id +// * @param loginTime 上岗时间 +// * @param handoverTime 交班时间 +// * @return 售出商品分类统计 +// */ +// List getHandoverCategoryList(Long shopId, String loginTime, String handoverTime); +// +// int decrMoney(@Param("id") Long id, @Param("amount") BigDecimal amount); +// +// int updatePayOrderId(@Param("orderId") Long orderId, @Param("paymentId") Long paymentId, @Param("payType") String payType, @Param("remark") String remark); +//} diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java index 207539a49..fed612f1e 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java @@ -10,10 +10,10 @@ import com.czg.account.dto.PrintOrderDetailDTO; import com.czg.account.entity.*; import com.czg.account.service.*; import com.czg.config.RedisCst; +import com.czg.market.service.OrderInfoService; import com.czg.order.entity.OrderDetail; import com.czg.order.entity.OrderInfo; import com.czg.order.service.OrderDetailService; -import com.czg.order.service.OrderInfoService; import com.czg.order.service.PrintMachineLogService; import com.czg.product.entity.ProdSku; import com.czg.product.entity.Product; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/CreditBuyerOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/CreditBuyerOrderServiceImpl.java index 9ff02b396..c893e4445 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/CreditBuyerOrderServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/CreditBuyerOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.czg.order.vo.CreditBuyerOrderSummaryVo; import com.czg.service.order.mapper.CreditBuyerMapper; import com.czg.service.order.mapper.CreditBuyerOrderMapper; import com.czg.service.order.mapper.CreditPaymentRecordMapper; -import com.czg.service.order.mapper.OrderInfoMapper; +import com.czg.service.market.mapper.OrderInfoMapper; import com.czg.utils.PageUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -334,4 +334,4 @@ public class CreditBuyerOrderServiceImpl extends ServiceImpl implements OrderInfoService { +@Service +public class OrderInfoCustomServiceImpl extends OrderInfoServiceImpl implements OrderInfoCustomService { @Lazy @Resource diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java index a5a7e5220..968faa6a0 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java @@ -13,7 +13,7 @@ import com.czg.order.entity.OrderInfo; import com.czg.order.service.OrderInfoRpcService; import com.czg.product.service.ProductRpcService; import com.czg.service.order.mapper.OrderDetailMapper; -import com.czg.service.order.mapper.OrderInfoMapper; +import com.czg.service.market.mapper.OrderInfoMapper; import com.mybatisflex.core.query.QueryWrapper; import io.seata.spring.annotation.GlobalTransactional; import jakarta.annotation.Resource; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 50cb5bb8e..5524d33fa 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -31,7 +31,8 @@ import com.czg.order.entity.OrderPayment; import com.czg.order.enums.PayEnums; import com.czg.order.service.CreditBuyerOrderService; import com.czg.order.service.OrderDetailService; -import com.czg.order.service.OrderInfoService; +import com.czg.market.service.OrderInfoService; +import com.czg.order.service.OrderInfoCustomService; import com.czg.order.service.OrderPaymentService; import com.czg.resp.CzgRespCode; import com.czg.resp.CzgResult; @@ -93,7 +94,7 @@ public class PayServiceImpl implements PayService { @Resource private CzgPayService czgPayService; @Resource - private OrderInfoService orderInfoService; + private OrderInfoCustomServiceImpl orderInfoService; @Resource private OrderDetailService orderDetailService; @Resource diff --git a/cash-service/order-service/src/main/resources/mapper/OrderInfoCustomMapper.xml b/cash-service/order-service/src/main/resources/mapper/OrderInfoCustomMapper.xml new file mode 100644 index 000000000..823095a8e --- /dev/null +++ b/cash-service/order-service/src/main/resources/mapper/OrderInfoCustomMapper.xml @@ -0,0 +1,171 @@ + + + + + + AND t1.shop_id = + #{shopId} + = + str_to_date + ( + #{loginTime}, + '%Y-%m-%d %H:%i:%s' + ) + AND + t1 + . + paid_time + <= + str_to_date + ( + #{handoverTime}, + '%Y-%m-%d %H:%i:%s' + ) + ]]> + + + update tb_order_info set origin_amount = origin_amount-#{amount}, update_time=now() where id=#{id} and origin_amount-#{amount} >= 0; + + + + update tb_order_info + set pay_order_id = #{paymentId}, + pay_type = #{payType}, + update_time=now() + + , remark = #{remark} + + where id = #{orderId}; + + + + + + + + + + + + + + + +