From ed59e39960389375f8fec220ddf5b5d5bdf2344f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 11 Nov 2025 16:24:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=AE=A2=E7=AB=8B=E5=87=8F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/account/dto/shopuser/ShopUserDTO.java | 1 + .../MkShopConsumeDiscountRecordService.java | 3 +++ .../service/impl/AShopUserServiceImpl.java | 9 ++++++- ...kShopConsumeDiscountRecordServiceImpl.java | 27 +++++++++++++------ 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java index 5cf4c5bf9..63519f844 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java @@ -27,4 +27,5 @@ public class ShopUserDTO extends ShopUser { private String memberLevelName; private String nextMemberLevelName; private Long nextExperience; + private boolean isNew; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java index 7b75ca035..f0b839135 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java @@ -1,5 +1,6 @@ package com.czg.market.service; +import com.czg.account.entity.ShopUser; import com.czg.market.vo.MkConsumeDiscountVO; import com.mybatisflex.core.service.IService; import com.czg.market.entity.MkShopConsumeDiscountRecord; @@ -37,4 +38,6 @@ public interface MkShopConsumeDiscountRecordService extends IService getPage(String key, Integer isVip, BigDecimal amount) { Long mainIdByShopId = shopInfoService.getMainIdByShopId(StpKit.USER.getShopId()); PageHelper.startPage(PageUtil.buildPageHelp()); - return PageUtil.convert(new PageInfo<>(shopUserMapper.selectPageByKeyAndIsVip(mainIdByShopId, isVip, key, amount))); + PageInfo shopUserDTOPageInfo = new PageInfo<>(shopUserMapper.selectPageByKeyAndIsVip(mainIdByShopId, isVip, key, amount)); + shopUserDTOPageInfo.getList().forEach(item -> { + item.setNew(consumeDiscountService.isNewUser(item, StpKit.USER.getShopId())); + }); + return PageUtil.convert(shopUserDTOPageInfo); } @Override diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java index 010146724..8fba69d97 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java @@ -22,6 +22,7 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.auth.v1alpha1.Ca; import org.apache.dubbo.config.annotation.DubboReference; +import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -35,7 +36,7 @@ import java.util.Random; * @since 2025-09-17 */ @Slf4j -@Service +@DubboService public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl implements MkShopConsumeDiscountRecordService { @Resource private MkConsumeDiscountService consumeDiscountService; @@ -101,9 +102,25 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl Date: Tue, 11 Nov 2025 16:49:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/order/service/OrderDetailService.java | 4 ++++ .../order/service/impl/OrderDetailServiceImpl.java | 11 +++++++++++ .../order/service/impl/OrderInfoServiceImpl.java | 5 ++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderDetailService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderDetailService.java index 81675256c..6e6869c62 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderDetailService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderDetailService.java @@ -16,4 +16,8 @@ public interface OrderDetailService extends IService { void createOrderDetails(Long orderId, List orderDetails); List getOrderDetailPrint(Long orderId); + + + // 更新订单详情状态 将订单详情的状态为wait-pay 更新为 payed + void updateOrderDetailStatus(Long orderId,String status); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java index 309e0f209..bf4afaee5 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java @@ -4,6 +4,7 @@ import com.czg.order.entity.OrderDetail; import com.czg.order.service.OrderDetailService; import com.czg.order.vo.OrderDetailPrintVo; import com.czg.service.order.mapper.OrderDetailMapper; +import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboService; @@ -27,4 +28,14 @@ public class OrderDetailServiceImpl extends ServiceImpl getOrderDetailPrint(Long orderId) { return getMapper().getOrderDetailPrint(orderId); } + + @Override + public void updateOrderDetailStatus(Long orderId,String status) { + OrderDetail orderDetail = getById(orderId); + orderDetail.setStatus(status); + update(orderDetail, QueryWrapper.create() + .eq(OrderDetail::getOrderId,orderId) + .eq(OrderDetail::getStatus,"wait-pay") + ); + } } 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 a5e605903..38a2c3004 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 @@ -1103,6 +1103,7 @@ public class OrderInfoServiceImpl extends ServiceImpl