From 4e9d4b620faceba09243655191ded90bb8c31cee Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 8 Apr 2025 09:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/order/entity/OrderInfo.java | 5 ++++- .../src/main/java/com/czg/order/vo/OrderInfoVo.java | 4 ++++ .../service/order/service/impl/PayServiceImpl.java | 2 ++ .../product/service/impl/ShopSyncServiceImpl.java | 12 ++++-------- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java index 9e149dfd..bd0c27c1 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java @@ -23,7 +23,6 @@ import lombok.NoArgsConstructor; * @since 2025-02-13 */ @Data - @NoArgsConstructor @AllArgsConstructor @Table("tb_order_info") @@ -128,6 +127,10 @@ public class OrderInfo implements Serializable { * 台桌名称 */ private String tableName; + /** + * 退款方式 现金退款-cash 原路退回-payBack + */ + private String refundType; /** * 订单类型- diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java index f5c1ccff..b79f7005 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java @@ -71,6 +71,10 @@ public class OrderInfoVo implements Serializable { * miniapp小程序 */ private String orderType; + /** + * 退款方式 现金退款-cash 原路退回-payBack + */ + private String refundType; /** * 平台类型 pc 收银机客户端 wechat 微信小程序 alipay 支付宝小程序 admin-pc PC管理端 admin-app APP管理端 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 b65d63e6..81d14777 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 @@ -667,7 +667,9 @@ public class PayServiceImpl implements PayService { refundOrder(orderInfo.getShopId(), orderInfo.getId(), orderInfo.getPayOrderId(), refPayOrderNo, StrUtil.isBlank(param.getRefundReason()) ? "退款" : param.getRefundReason(), param.getRefundAmount()); } + orderInfo.setRefundType("payBack"); } + orderInfo.setRefundType("cash"); } else { orderInfo.setOrderAmount(orderInfo.getOrderAmount().subtract(param.getRefundAmount())); } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java index d24c7b9b..dfdbca7d 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java @@ -4,23 +4,17 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.czg.account.entity.ShopInfo; -import com.czg.account.entity.SysRole; import com.czg.account.service.ShopInfoService; +import com.czg.account.service.SyncNoticeService; import com.czg.exception.CzgException; import com.czg.product.entity.*; import com.czg.product.service.*; import com.czg.product.vo.ProductGroupVo; -import com.czg.service.product.mapper.ConsInfoMapper; -import com.czg.service.product.mapper.ProdConsRelationMapper; -import com.czg.service.product.mapper.ProdSkuMapper; import com.czg.utils.AssertUtil; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -31,7 +25,6 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import static com.mybatisflex.core.query.QueryMethods.column; @@ -64,6 +57,8 @@ public class ShopSyncServiceImpl implements ShopSyncService { private ConsGroupService consGroupService; @Resource private ProdConsRelationService prodConsRelationService; + @Resource + private SyncNoticeService syncNoticeService; private void checkShopInfo(Long sourceShopId, Long targetShopId) { AssertUtil.isNull(sourceShopId, "{}不能为空", "源店铺ID"); @@ -78,6 +73,7 @@ public class ShopSyncServiceImpl implements ShopSyncService { || targetShop.getIsHeadShop() == null || targetShop.getIsHeadShop().equals(1)) { throw new CzgException("同步失败,目标店铺是主店铺或目标店铺是单店"); } + } @Override