From cb18aa567010f1d1e8b8d46bd92af417711a554d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 26 Dec 2025 17:09:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/order/entity/OrderPayment.java | 2 +- .../account/service/impl/ShopInfoServiceImpl.java | 3 +-- .../service/order/service/impl/PayServiceImpl.java | 13 ++++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java index 69b5cbd70..16a58f2b5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java @@ -81,7 +81,7 @@ public class OrderPayment implements Serializable { */ private String tradeNumber; - @Column(onUpdateValue = "now()") +// @Column(onUpdateValue = "now()") private LocalDateTime payTime; /** diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index f60642bb3..49ed510e4 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -253,6 +253,7 @@ public class ShopInfoServiceImpl extends ServiceImpl i @Override @CacheEvict(key = "#shopInfoEditDTO.id") public Boolean edit(ShopInfoEditDTO shopInfoEditDTO) { + shopInfoEditDTO.setIsMemberPrice(null); ShopInfo shopInfo; if (!StpKit.USER.isAdmin()) { shopInfo = queryChain().eq(ShopInfo::getId, StpKit.USER.getShopId()).one(); @@ -319,8 +320,6 @@ public class ShopInfoServiceImpl extends ServiceImpl i rabbitPublisher.sendOrderDetailStatusMsg(shopInfo.getId().toString(), "shopInfoUpdate"); return true; } - - return false; } 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 e195bf9c8..0c14f7fc6 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 @@ -818,7 +818,7 @@ public class PayServiceImpl implements PayService { if (!returnProMap.isEmpty()) { rabbitPublisher.sendOrderRefundMsg(JSONObject.toJSONString(Map.of("orderId", orderInfo.getId(), "returnProMap", returnProMap))); } - FunUtils.asyncSafeRunVoid(()->refundOrderAfter(orderInfo.getId(), orderInfo.getShopId(), orderInfo.getUserId(), orderInfo.getOrderNo(), + FunUtils.asyncSafeRunVoid(() -> refundOrderAfter(orderInfo.getId(), orderInfo.getShopId(), orderInfo.getUserId(), orderInfo.getOrderNo(), orderInfo.getPointsNum(), isFirstRefund, orderInfo.getStatus().equals(OrderStatusEnums.REFUND.getCode()))); return CzgResult.success(); } @@ -864,12 +864,11 @@ public class PayServiceImpl implements PayService { } throw new CzgException(refund.getMsg()); } else { - paymentService.updateChain() - .eq(OrderPayment::getId, refundId) - .set(OrderPayment::getPayTime, refund.getData().getRefundTime()) - .set(OrderPayment::getTradeNumber, refund.getData().getRefundOrderId()) - .set(OrderPayment::getRespJson, JSONObject.toJSONString(refund.getData())) - .update(); + OrderPayment uOrderPayment = new OrderPayment(); + uOrderPayment.setPayTime(LocalDateTime.now()); + uOrderPayment.setTradeNumber(refund.getData().getRefundOrderId()); + uOrderPayment.setRespJson(JSONObject.toJSONString(refund.getData())); + paymentService.update(uOrderPayment, QueryWrapper.create().eq(OrderPayment::getId, refundId)); } }