orderinfo迁移

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;
-
 /**
  * 生日有礼奖励发放
  *

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;

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;

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

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;

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;
 

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

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;

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;
 

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;
 
 /**

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 过期

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<OrderInfo> {
+}

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<OrderInfo> {
+public interface OrderInfoCustomService {
 
     Page<OrderInfoVo> getOrderByPage(OrderInfoQueryDTO param);
 

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;

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;

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<OrderInfo> {
-
     /**
      * 交班现金支付统计
      *
@@ -141,4 +139,5 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
     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);
-}
+
+  }

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<MemberOrderMapper, Membe
     private ShopUserService shopUserService;
     @DubboReference
     private TbMemberConfigService memberConfigService;
-    @DubboReference
+    @Resource
     private OrderInfoService orderInfoService;
     @DubboReference
     private OrderPaymentService paymentService;

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java

@@ -18,9 +18,9 @@ import com.czg.market.entity.MkConsumeCashbackRecord;
 import com.czg.market.entity.MkConsumeCashbackStep;
 import com.czg.market.service.MkConsumeCashbackRecordService;
 import com.czg.market.service.MkConsumeCashbackService;
+import com.czg.market.service.OrderInfoService;
 import com.czg.market.vo.MkConsumeCashbackVO;
 import com.czg.order.entity.OrderInfo;
-import com.czg.order.service.OrderInfoService;
 import com.czg.service.market.enums.OrderStatusEnums;
 import com.czg.service.market.mapper.MkConsumeCashbackMapper;
 import com.czg.utils.AssertUtil;
@@ -55,7 +55,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
     private ShopInfoService shopInfoService;
     @DubboReference
     private ShopUserService shopUserService;
-    @DubboReference
+    @Resource
     private OrderInfoService orderInfoService;
     @DubboReference
     private ShopConfigService shopConfigService;

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java

@@ -25,7 +25,7 @@ import com.czg.market.vo.InviteUserVO;
 import com.czg.market.vo.MkDistributionConfigVO;
 import com.czg.order.dto.MkDistributionPayDTO;
 import com.czg.order.entity.OrderInfo;
-import com.czg.order.service.OrderInfoService;
+import com.czg.market.service.OrderInfoService;
 import com.czg.order.service.OrderPaymentService;
 import com.czg.sa.StpKit;
 import com.czg.service.market.enums.OrderStatusEnums;
@@ -86,7 +86,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
     private UserInfoService userInfoService;
     @DubboReference
     private OrderPaymentService orderPaymentService;
-    @DubboReference
+    @Resource
     private OrderInfoService orderInfoService;
     @DubboReference
     private ShopInfoService shopInfoService;

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java

@@ -10,7 +10,7 @@ import com.czg.market.entity.MkConsumeDiscountRandom;
 import com.czg.market.service.MkConsumeDiscountService;
 import com.czg.market.vo.MkConsumeDiscountVO;
 import com.czg.order.entity.OrderInfo;
-import com.czg.order.service.OrderInfoService;
+import com.czg.market.service.OrderInfoService;
 import com.czg.service.market.enums.OrderStatusEnums;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -40,7 +40,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
     private MkConsumeDiscountService consumeDiscountService;
     @DubboReference
     private ShopUserService shopUserService;
-    @DubboReference
+    @Resource
     private OrderInfoService orderInfoService;
 
     @Override

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/OrderInfoServiceImpl.java

@@ -0,0 +1,13 @@
+package com.czg.service.market.service.impl;
+
+import com.czg.market.service.OrderInfoService;
+import com.czg.order.entity.OrderInfo;
+import com.czg.service.market.mapper.OrderInfoMapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.context.annotation.Primary;
+
+@DubboService
+@Primary
+public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo> implements OrderInfoService {
+}

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<ShopCouponMapper, ShopCou
     private ShopUserService shopUserService;
     @DubboReference
     private ProductService productService;
-    @DubboReference
+    @Resource
     private OrderInfoService orderInfoService;
 
     @Override

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java

@@ -16,7 +16,6 @@ import com.czg.market.service.*;
 import com.czg.market.vo.*;
 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.enums.OrderStatusEnums;
 import com.czg.service.market.mapper.TbMemberConfigMapper;
@@ -28,7 +27,6 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -53,7 +51,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
     private UserInfoService userInfoService;
     @DubboReference
     private ShopUserService shopUserService;
-    @DubboReference
+    @Resource
     private OrderInfoService orderInfoService;
     @DubboReference
     private OrderPaymentService paymentService;

cash-service/market-service/src/main/resources/mapper/OrderInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.czg.service.order.mapper.OrderInfoMapper">
+<mapper namespace="com.czg.service.market.mapper.OrderInfoMapper">
 
     <sql id="handoverCommonWhere">
         AND t1.shop_id =
@@ -37,11 +37,11 @@
     <update id="updatePayOrderId">
         update tb_order_info
         set pay_order_id = #{paymentId},
-            pay_type     = #{payType},
+        pay_type     = #{payType},
-            update_time=now()
+        update_time=now()
-            <if test="remark != null and remark != ''">
+        <if test="remark != null and remark != ''">
-                , remark = #{remark}
+            , remark = #{remark}
-            </if>
+        </if>
         where id = #{orderId};
     </update>
 
@@ -167,5 +167,4 @@
             and t1.pay_type = 'credit_pay'
         </where>
     </select>
-
 </mapper>

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<OrderInfo> {
+//
+//    /**
+//     * 交班现金支付统计
+//     *
+//     * @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<HandoverProductListVo> getHandoverDetailList(Long shopId, String loginTime, String handoverTime);
+//
+//    /**
+//     * 交班售出商品分类统计
+//     *
+//     * @param shopId       店铺id
+//     * @param loginTime    上岗时间
+//     * @param handoverTime 交班时间
+//     * @return 售出商品分类统计
+//     */
+//    List<HandoverCategoryListVo> 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);
+//}

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;

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;

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

@@ -36,7 +36,7 @@ import com.czg.order.entity.OrderPayment;
 import com.czg.order.enums.PayEnums;
 import com.czg.order.service.CashierCartService;
 import com.czg.order.service.OrderDetailService;
-import com.czg.order.service.OrderInfoService;
+import com.czg.order.service.OrderInfoCustomService;
 import com.czg.order.service.OrderPaymentService;
 import com.czg.order.vo.*;
 import com.czg.product.entity.Product;
@@ -45,8 +45,9 @@ import com.czg.product.service.ProductService;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.service.RedisService;
+import com.czg.service.market.mapper.OrderInfoMapper;
+import com.czg.service.market.service.impl.OrderInfoServiceImpl;
 import com.czg.service.order.enums.OrderStatusEnums;
-import com.czg.service.order.mapper.OrderInfoMapper;
 import com.czg.service.order.print.PrinterHandler;
 import com.czg.utils.AssertUtil;
 import com.czg.utils.CzgStrUtils;
@@ -59,9 +60,10 @@ import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotBlank;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.dubbo.config.annotation.DubboService;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -84,8 +86,8 @@ import java.util.stream.Collectors;
  * @since 2025-02-13
  */
 @Slf4j
-@DubboService
+@Service
-public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo> implements OrderInfoService {
+public class OrderInfoCustomServiceImpl  extends OrderInfoServiceImpl implements OrderInfoCustomService {
 
     @Lazy
     @Resource

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;

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

cash-service/order-service/src/main/resources/mapper/OrderInfoCustomMapper.xml

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.czg.service.order.mapper.OrderInfoCustomMapper">
+
+    <sql id="handoverCommonWhere">
+        AND t1.shop_id =
+        #{shopId}
+        <![CDATA[
+        AND
+        t1
+        .
+        paid_time
+        >=
+        str_to_date
+        (
+        #{loginTime},
+        '%Y-%m-%d %H:%i:%s'
+        )
+        AND
+        t1
+        .
+        paid_time
+        <=
+        str_to_date
+        (
+        #{handoverTime},
+        '%Y-%m-%d %H:%i:%s'
+        )
+        ]]>
+    </sql>
+    <update id="decrMoney">
+        update tb_order_info set origin_amount = origin_amount-#{amount}, update_time=now() where id=#{id} and origin_amount-#{amount} >= 0;
+    </update>
+
+    <update id="updatePayOrderId">
+        update tb_order_info
+        set pay_order_id = #{paymentId},
+            pay_type     = #{payType},
+            update_time=now()
+            <if test="remark != null and remark != ''">
+                , remark = #{remark}
+            </if>
+        where id = #{orderId};
+    </update>
+
+    <select id="getHandoverCashAmount" resultType="java.math.BigDecimal">
+        SELECT
+        ifnull(sum(t1.pay_amount),0)
+        FROM tb_order_info t1
+        <where>
+            <include refid="handoverCommonWhere"/>
+            and t1.pay_type = 'cash_pay'
+        </where>
+    </select>
+    <select id="getHandoverRefundAmount" resultType="java.math.BigDecimal">
+        SELECT
+        ifnull(sum(t1.refund_amount),0)
+        FROM tb_order_info t1
+        <where>
+            <include refid="handoverCommonWhere"/>
+        </where>
+    </select>
+    <select id="getHandoverTotalAmount" resultType="java.math.BigDecimal">
+        SELECT
+        ifnull(sum(t1.pay_amount),0)
+        FROM tb_order_info t1
+        <where>
+            <include refid="handoverCommonWhere"/>
+        </where>
+    </select>
+    <select id="getHandoverOrderNum" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM tb_order_info t1
+        <where>
+            <include refid="handoverCommonWhere"/>
+        </where>
+    </select>
+    <select id="getHandoverDetailList" resultType="com.czg.account.vo.HandoverProductListVo">
+        SELECT
+        t2.product_id,
+        t2.sku_id,
+        GROUP_CONCAT( DISTINCT t2.product_name ) AS product_name,
+        GROUP_CONCAT( DISTINCT t2.sku_name ) AS sku_name,
+        sum( ifnull(t2.num,0) ) AS num,
+        sum( ifnull(t2.pay_amount,0) ) amount
+        FROM
+        tb_order_detail t2
+        LEFT JOIN tb_order_info t1 ON t1.id = t2.order_id
+        <where>
+            <include refid="handoverCommonWhere"/>
+        </where>
+        GROUP BY
+        t2.product_id,
+        t2.sku_id
+    </select>
+    <select id="getHandoverWechatAmount" resultType="java.math.BigDecimal">
+        SELECT
+        ifnull(sum(t1.pay_amount),0)
+        FROM tb_order_info t1
+        <where>
+            <include refid="handoverCommonWhere"/>
+            and t1.pay_type = 'wechat_mini'
+        </where>
+    </select>
+    <select id="getHandoverAlipayAmount" resultType="java.math.BigDecimal">
+        SELECT
+        ifnull(sum(t1.pay_amount),0)
+        FROM tb_order_info t1
+        <where>
+            <include refid="handoverCommonWhere"/>
+            and t1.pay_type = 'alipay_mini'
+        </where>
+    </select>
+    <select id="getHandoverVipPayAmount" resultType="java.math.BigDecimal">
+        SELECT
+        ifnull(sum(t1.pay_amount),0)
+        FROM tb_order_info t1
+        <where>
+            <include refid="handoverCommonWhere"/>
+            and t1.pay_type = 'vip_pay'
+        </where>
+    </select>
+    <select id="getHandoverVipChargeAmount" resultType="java.math.BigDecimal">
+        select ifnull(sum(t1.amount), 0)
+        from tb_shop_user_flow t1
+        where t1.shop_id = #{shopId}
+          and t1.biz_code in ('cashIn', 'wechatIn', 'alipayIn', 'adminIn')
+          and t1.recharge_id is not null
+        <![CDATA[
+          AND t1.create_time >= str_to_date(#{loginTime}, '%Y-%m-%d %H:%i:%s')
+          AND t1.create_time <= str_to_date(#{handoverTime}, '%Y-%m-%d %H:%i:%s')
+        ]]>
+    </select>
+    <select id="getHandoverQuickPayAmount" resultType="java.math.BigDecimal">
+        SELECT
+        ifnull(sum(pay_amount),0)
+        FROM tb_order_info t1
+        <where>
+            <include refid="handoverCommonWhere"/>
+            and t1.pay_type in ('main_scan','back_scan')
+        </where>
+    </select>
+    <select id="getHandoverCategoryList" resultType="com.czg.account.vo.HandoverCategoryListVo">
+        SELECT case when t3.category_id is null then 0 else t3.category_id end as category_id,
+        case when t4.name is null then '未分类' else t4.name end as category_name,
+        count(DISTINCT t2.product_id) AS quantity,
+        sum(ifnull(t2.num, 0)) AS num,
+        sum(ifnull(t2.pay_amount, 0)) amount
+        FROM tb_order_detail t2
+        LEFT JOIN tb_order_info t1 ON t1.id = t2.order_id
+        LEFT JOIN tb_product t3 ON t3.id = t2.product_id
+        LEFT JOIN tb_shop_prod_category t4 ON t4.id = t3.category_id
+        <where>
+            <include refid="handoverCommonWhere"/>
+        </where>
+        GROUP BY t3.category_id
+    </select>
+    <select id="getHandoverCreditAmount" resultType="java.math.BigDecimal">
+        SELECT
+        ifnull(sum(t1.pay_amount),0)
+        FROM tb_order_info t1
+        <where>
+            <include refid="handoverCommonWhere"/>
+            and t1.pay_type = 'credit_pay'
+        </where>
+    </select>
+
+</mapper>