From 20610bf4566b288b086bae0373b213cccc3f9bb7 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 17 Dec 2025 15:24:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=9B=A2=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/order/vo/GbOrderDetailVO.java | 4 ++++ .../java/com/czg/service/order/mapper/GbOrderMapper.java | 2 +- .../czg/service/order/service/impl/GbOrderServiceImpl.java | 2 +- .../com/czg/service/order/service/impl/PayServiceImpl.java | 7 +++---- .../src/main/resources/mapper/GbOrderMapper.xml | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java index 2b5429e6f..ad7e98536 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java @@ -29,6 +29,10 @@ public class GbOrderDetailVO extends GbOrderDetail { * 店铺名称 */ private String shopName; + /** + * 要求成团人数 + */ + private Integer groupPeopleNum; /** * 店铺地址 */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java index 951b8ecef..9ee655609 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java @@ -18,7 +18,7 @@ public interface GbOrderMapper extends BaseMapper { List getGbOrderPage(GbOrderQueryParam param, Long shopId, Long mainShopId); - GbOrderDetailVO getGbOrderDetail(Long shopId, Long detailId); + GbOrderDetailVO getGbOrderDetail(Long mainShopId, Long shopId, Long detailId); List getGbOrderDetailUsers(Long mainShopId, Long shopId, String groupOrderNo); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java index 8b917121d..07a7fe429 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java @@ -101,7 +101,7 @@ public class GbOrderServiceImpl extends ServiceImpl impl @Override public GbOrderDetailVO getGoodsRecordDetail(Long shopId, Long detailId) { Long mainIdByShopId = shopInfoService.getMainIdByShopId(shopId); - GbOrderDetailVO gbOrderDetail = mapper.getGbOrderDetail(shopId, detailId); + GbOrderDetailVO gbOrderDetail = mapper.getGbOrderDetail(mainIdByShopId, shopId, detailId); AssertUtil.isNull(gbOrderDetail, "记录不存在"); List users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo()); gbOrderDetail.setUsers(users); 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 85dedeff5..15baf3002 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 @@ -28,7 +28,6 @@ import com.czg.market.vo.MkShopRechargeVO; import com.czg.order.dto.CheckOrderPay; import com.czg.order.dto.LtPayOtherDTO; import com.czg.order.dto.OrderInfoRefundDTO; -import com.czg.order.dto.PointGoodsExchangeDTO; import com.czg.order.entity.OrderDetail; import com.czg.order.entity.OrderInfo; import com.czg.order.entity.OrderPayment; @@ -630,7 +629,7 @@ public class PayServiceImpl implements PayService { } String refPayOrderNo = "REFVIP" + IdUtil.getSnowflakeNextId(); refPaymentId = initOrderPayment(new OrderPayment(refPayParam.getShopId(), shopUser.getId(), - "memberRefund", refPayOrderNo, null, refPayParam.getRefAmount())); + PaymentPayTypeEnum.MEMBER_REFUND.getValue(), refPayOrderNo, null, refPayParam.getRefAmount())); CzgResult refund = refund(refPayParam.getShopId(), new CzgRefundReq(refPayOrderNo, refPayParam.getRemark(), refPayParam.getRefAmount().multiply(MONEY_RATE).longValue(), payment.getOrderNo(), "")); if (refund.getCode() != 200 || refund.getData() == null || !"SUCCESS".equals(refund.getData().getState())) { @@ -825,7 +824,7 @@ public class PayServiceImpl implements PayService { @NonNull String refundReason, @NonNull BigDecimal refundAmount) { OrderPayment payment = paymentService.getById(payOrderId); AssertUtil.isNull(payment, "退款失败支付记录不存在"); - Long refundId = initOrderPayment(new OrderPayment(shopId, orderId, "refund", refPayOrderNo, null, refundAmount, payment.getId())); + Long refundId = initOrderPayment(new OrderPayment(shopId, orderId, PaymentPayTypeEnum.REFUND.getValue(), refPayOrderNo, null, refundAmount, payment.getId())); CzgResult refund = refund(shopId, new CzgRefundReq(refPayOrderNo, refundReason, refundAmount.multiply(MONEY_RATE).longValue(), payment.getOrderNo(), "")); if (refund.getCode() != 200 || refund.getData() == null || !"SUCCESS".equals(refund.getData().getState())) { @@ -849,7 +848,7 @@ public class PayServiceImpl implements PayService { @NonNull String refundReason, @NonNull BigDecimal refundAmount) { OrderPayment payment = paymentService.getById(payOrderId); AssertUtil.isNull(payment, "退款失败,支付记录不存在"); - Long refundId = initOrderPayment(new OrderPayment(shopId, sourceId, "refund", refPayOrderNo, null, refundAmount, payment.getId())); + Long refundId = initOrderPayment(new OrderPayment(shopId, sourceId, PaymentPayTypeEnum.REFUND.getValue(), refPayOrderNo, null, refundAmount, payment.getId())); CzgResult refund = refund(shopId, new CzgRefundReq(refPayOrderNo, refundReason, refundAmount.multiply(MONEY_RATE).longValue(), payment.getOrderNo(), "")); OrderPayment uOrderPayment = new OrderPayment(); diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml index 5ff825d27..028d60af0 100644 --- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml @@ -6,8 +6,8 @@