From f23517c6c1a5fbeadd62cab40a3f091c179e763a Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Fri, 28 Feb 2025 11:39:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A4=E7=8F=AD=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/OrderInfoRpcService.java | 137 ++++++++++++++++++ .../czg/order/service/OrderInfoService.java | 123 ---------------- .../impl/HandoverRecordServiceImpl.java | 28 ++-- .../service/impl/OrderInfoRpcServiceImpl.java | 88 +++++++++++ .../service/impl/OrderInfoServiceImpl.java | 64 -------- 5 files changed, 239 insertions(+), 201 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoRpcService.java create mode 100644 cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoRpcService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoRpcService.java new file mode 100644 index 000000000..7879fa134 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoRpcService.java @@ -0,0 +1,137 @@ +package com.czg.order.service; + +import com.czg.account.vo.HandoverCategoryListVo; +import com.czg.account.vo.HandoverProductListVo; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 订单RpcService + * + * @author tankaikai + * @since 2025-02-28 11:28 + */ +public interface OrderInfoRpcService { + + /** + * 交班现金支付统计 + * + * @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); + +} 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/OrderInfoService.java index c0e11f07d..65b7f6297 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/OrderInfoService.java @@ -1,8 +1,6 @@ package com.czg.order.service; import com.alibaba.fastjson2.JSONObject; -import com.czg.account.vo.HandoverCategoryListVo; -import com.czg.account.vo.HandoverProductListVo; import com.czg.order.dto.CheckOrderPay; import com.czg.order.dto.OrderInfoAddDTO; import com.czg.order.dto.OrderInfoQueryDTO; @@ -17,7 +15,6 @@ import org.jetbrains.annotations.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.List; /** * 订单表 服务层。 @@ -40,124 +37,4 @@ public interface OrderInfoService extends IService { void upOrderInfo(OrderInfo orderInfo, BigDecimal payAmount, LocalDateTime payTime, Long payOrderId, PayEnums payType); void expired(Long orderId); - - /** - * 交班现金支付统计 - * - * @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); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java index d656f55e6..1502e7d2e 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java @@ -11,7 +11,7 @@ import com.czg.account.service.HandoverRecordService; import com.czg.account.vo.HandoverCategoryListVo; import com.czg.account.vo.HandoverProductListVo; import com.czg.account.vo.HandoverTotalVo; -import com.czg.order.service.OrderInfoService; +import com.czg.order.service.OrderInfoRpcService; import com.czg.sa.StpKit; import com.czg.service.account.mapper.HandoverRecordMapper; import com.czg.utils.PageUtil; @@ -35,7 +35,7 @@ import java.util.List; public class HandoverRecordServiceImpl extends ServiceImpl implements HandoverRecordService { @DubboReference - private OrderInfoService orderInfoService; + private OrderInfoRpcService orderInfoRpcService; private QueryWrapper buildQueryWrapper(HandoverRecordDTO param) { QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper(); @@ -95,13 +95,13 @@ public class HandoverRecordServiceImpl extends ServiceImpl categoryData = orderInfoService.getHandoverCategoryList(shopId, loginTimeStr, handoverTimeStr); + entity.setWechatAmount(orderInfoRpcService.getHandoverWechatAmount(shopId, loginTimeStr, handoverTimeStr)); + entity.setAlipayAmount(orderInfoRpcService.getHandoverAlipayAmount(shopId, loginTimeStr, handoverTimeStr)); + entity.setVipPay(orderInfoRpcService.getHandoverVipPayAmount(shopId, loginTimeStr, handoverTimeStr)); + entity.setVipRecharge(orderInfoRpcService.getHandoverVipChargeAmount(shopId, loginTimeStr, handoverTimeStr)); + entity.setQuickInAmount(orderInfoRpcService.getHandoverQuickPayAmount(shopId, loginTimeStr, handoverTimeStr)); + entity.setCreditAmount(orderInfoRpcService.getHandoverCreditAmount(shopId, loginTimeStr, handoverTimeStr)); + List categoryData = orderInfoRpcService.getHandoverCategoryList(shopId, loginTimeStr, handoverTimeStr); entity.setCategoryData(JSON.toJSONString(categoryData, JSONWriter.Feature.WriteMapNullValue)); List productData = data.getDetailList(); entity.setProductData(JSON.toJSONString(productData, JSONWriter.Feature.WriteMapNullValue)); @@ -110,22 +110,22 @@ public class HandoverRecordServiceImpl extends ServiceImpl getDetailList(Long shopId, String loginTime, String handoverTime) { - return orderInfoService.getHandoverDetailList(shopId, loginTime, handoverTime); + return orderInfoRpcService.getHandoverDetailList(shopId, loginTime, handoverTime); } } \ No newline at end of file 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 new file mode 100644 index 000000000..7ea97cdb8 --- /dev/null +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java @@ -0,0 +1,88 @@ +package com.czg.service.order.service.impl; + +import com.czg.account.vo.HandoverCategoryListVo; +import com.czg.account.vo.HandoverProductListVo; +import com.czg.order.service.OrderInfoRpcService; +import com.czg.service.order.mapper.OrderInfoMapper; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 订单Rpc ServiceImpl + * + * @author tankaikai + * @since 2025-02-28 11:29 + */ +@DubboService +@Service +@Slf4j +public class OrderInfoRpcServiceImpl implements OrderInfoRpcService { + + @Resource + private OrderInfoMapper orderInfoMapper; + + @Override + public BigDecimal getHandoverWechatAmount(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverWechatAmount(shopId, loginTime, handoverTime); + } + + @Override + public BigDecimal getHandoverAlipayAmount(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverAlipayAmount(shopId, loginTime, handoverTime); + } + + @Override + public BigDecimal getHandoverVipPayAmount(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverVipPayAmount(shopId, loginTime, handoverTime); + } + + @Override + public BigDecimal getHandoverVipChargeAmount(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverVipChargeAmount(shopId, loginTime, handoverTime); + } + + @Override + public BigDecimal getHandoverQuickPayAmount(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverQuickPayAmount(shopId, loginTime, handoverTime); + } + + @Override + public BigDecimal getHandoverCashAmount(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverCashAmount(shopId, loginTime, handoverTime); + } + + @Override + public BigDecimal getHandoverRefundAmount(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverRefundAmount(shopId, loginTime, handoverTime); + } + + @Override + public BigDecimal getHandoverCreditAmount(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverCreditAmount(shopId, loginTime, handoverTime); + } + + @Override + public BigDecimal getHandoverTotalAmount(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverTotalAmount(shopId, loginTime, handoverTime); + } + + @Override + public int getHandoverOrderNum(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverOrderNum(shopId, loginTime, handoverTime); + } + + @Override + public List getHandoverDetailList(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverDetailList(shopId, loginTime, handoverTime); + } + + @Override + public List getHandoverCategoryList(Long shopId, String loginTime, String handoverTime) { + return orderInfoMapper.getHandoverCategoryList(shopId, loginTime, handoverTime); + } +} diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 9cefc245d..713946db0 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -10,8 +10,6 @@ import com.alibaba.fastjson2.JSONObject; import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; import com.czg.account.entity.*; import com.czg.account.service.*; -import com.czg.account.vo.HandoverCategoryListVo; -import com.czg.account.vo.HandoverProductListVo; import com.czg.config.RabbitPublisher; import com.czg.config.RedisCst; import com.czg.entity.notify.CzgPayNotifyDTO; @@ -48,7 +46,6 @@ 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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -65,7 +62,6 @@ import java.util.*; * @since 2025-02-13 */ @Slf4j -@DubboService @Service public class OrderInfoServiceImpl extends ServiceImpl implements OrderInfoService { @@ -568,66 +564,6 @@ public class OrderInfoServiceImpl extends ServiceImpl getHandoverDetailList(Long shopId, String loginTime, String handoverTime) { - return super.mapper.getHandoverDetailList(shopId, loginTime, handoverTime); - } - - @Override - public List getHandoverCategoryList(Long shopId, String loginTime, String handoverTime) { - return super.mapper.getHandoverCategoryList(shopId, loginTime, handoverTime); - } - /** * 初始化订单信息 */ From 0c5469557e9ce6ed69d51d68cccab19dedc6ebe1 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Fri, 28 Feb 2025 11:50:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BE=E5=BA=93=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81&=E5=95=86=E5=93=81=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PictureClassifyServiceImpl.java | 16 +++++++++++++--- .../service/impl/PictureGalleryServiceImpl.java | 12 +++++++++++- .../service/impl/ShopProdUnitServiceImpl.java | 16 +++++++++++++--- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PictureClassifyServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PictureClassifyServiceImpl.java index f9ab5fbfd..c008b959d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PictureClassifyServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PictureClassifyServiceImpl.java @@ -35,7 +35,9 @@ public class PictureClassifyServiceImpl extends ServiceImpl { q.eq(PictureClassify::getShopId, shopId).or(q1 -> { - q1.eq(PictureClassify::getShopId, 0).eq(PictureClassify::getIsSystem, YesNoEnum.YES.value()); + q1.eq(PictureClassify::getShopId, 1L); + }).or(q2 -> { + q2.eq(PictureClassify::getIsSystem, YesNoEnum.YES.value()); }); }); queryWrapper.eq(PictureClassify::getIsDel, DeleteEnum.NORMAL.value()); @@ -56,7 +58,9 @@ public class PictureClassifyServiceImpl extends ServiceImpl { q.eq(PictureClassify::getShopId, shopId).or(q1 -> { - q1.eq(PictureClassify::getShopId, 0).eq(PictureClassify::getIsSystem, YesNoEnum.YES.value()); + q1.eq(PictureClassify::getShopId, 1L); + }).or(q2 -> { + q2.eq(PictureClassify::getIsSystem, YesNoEnum.YES.value()); }); }) ); @@ -78,7 +82,9 @@ public class PictureClassifyServiceImpl extends ServiceImpl { q.eq(PictureClassify::getShopId, shopId).or(q1 -> { - q1.eq(PictureClassify::getShopId, 0).eq(PictureClassify::getIsSystem, YesNoEnum.YES.value()); + q1.eq(PictureClassify::getShopId, 1L); + }).or(q2 -> { + q2.eq(PictureClassify::getIsSystem, YesNoEnum.YES.value()); }); }) ); @@ -102,6 +108,7 @@ public class PictureClassifyServiceImpl extends ServiceImpl { + q.eq(PictureGallery::getShopId, shopId).or(q1 -> { + q1.eq(PictureGallery::getShopId, 1L); + }); + }); queryWrapper.eq(PictureGallery::getIsDel, DeleteEnum.NORMAL.value()); queryWrapper.orderBy(PictureGallery::getId, false); return queryWrapper; @@ -61,7 +67,11 @@ public class PictureGalleryServiceImpl extends ServiceImpl { q.eq(ShopProdUnit::getShopId, shopId).or(q1 -> { - q1.eq(ShopProdUnit::getShopId, 0).eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value()); + q1.eq(ShopProdUnit::getShopId, 1L); + }).or(q2 -> { + q2.eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value()); }); }); queryWrapper.orderBy(ShopProdUnit::getId, false); @@ -70,7 +72,9 @@ public class ShopProdUnitServiceImpl extends ServiceImpl { q.eq(ShopProdUnit::getShopId, shopId).or(q1 -> { - q1.eq(ShopProdUnit::getShopId, 0).eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value()); + q1.eq(ShopProdUnit::getShopId, 1L); + }).or(q2 -> { + q2.eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value()); }); })); if (exists) { @@ -95,7 +99,9 @@ public class ShopProdUnitServiceImpl extends ServiceImpl { q.eq(ShopProdUnit::getShopId, shopId).or(q1 -> { - q1.eq(ShopProdUnit::getShopId, 0).eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value()); + q1.eq(ShopProdUnit::getShopId, 1L); + }).or(q2 -> { + q2.eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value()); }); }) ); @@ -136,6 +142,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl