Merge branch 'dev/2024/0625/update-admin-Y' of Harper/feifan-backend-zx-admin into master

修改查询订单,多加一个状态

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathServiceImpl.java

@@ -11,6 +11,7 @@ import cn.newfeifan.mall.module.distri.enums.SocialStatusEnum;
 import cn.newfeifan.mall.module.distri.service.duser.DuserService;
 import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
 import cn.newfeifan.mall.module.distri.service.ordercalc.OrderCalcService;
+import cn.newfeifan.mall.module.distri.service.orderpercentage.OrderPercentageService;
 import cn.newfeifan.mall.module.distri.service.socialstatus.SocialStatusService;
 import cn.newfeifan.mall.module.distri.service.socialstatuschangelog.SocialStatusChangeLogService;
 import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
@@ -26,6 +27,7 @@ import javax.annotation.Resource;
 
 import org.springframework.validation.annotation.Validated;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -75,6 +77,8 @@ public class SharePathServiceImpl implements SharePathService {
 
     @Resource
     private SocialStatusService socialStatusService;
+    @Resource
+    private OrderPercentageService orderPercentageService;
 
     @Override
     public Long createSharePath(SharePathSaveReqVO createReqVO) {
@@ -249,7 +253,11 @@ public class SharePathServiceImpl implements SharePathService {
         if (duser == null) return memberUserRespVO;
 
         IntegralDO integral = integralService.getIntegralByUserId(userId);
-        if (integral != null) memberUserRespVO.setCurrentQuota(integral.getCurrentQuota());
+        if (integral != null){
+            memberUserRespVO.setCurrentQuota(integral.getCurrentQuota());
+            OrderPercentageDO orderPercentageDO = orderPercentageService.queryStatus();
+            memberUserRespVO.setHighQuotaTotal(integral.getHighQuotaTotal() + new BigDecimal(orderPercentageDO.getBaseMaxQuota()).longValue());
+        }
 
         SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duser.getSocialStatusId());
         if (socialStatus == null) return memberUserRespVO;

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -48,9 +48,9 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .likeIfPresent(TradeOrderDO::getPickUpVerifyCode, reqVO.getPickUpVerifyCode())
                 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(TradeOrderDO::getId);
-        if(reqVO.getStatus().equals(TradeOrderStatusEnum.AFTER_SALE.getStatus())){
+        if(reqVO.getStatus() != null && reqVO.getStatus().equals(TradeOrderStatusEnum.AFTER_SALE.getStatus())){
             queryWrapper.eq(TradeOrderDO::getRefundStatus, TradeOrderRefundStatusEnum.ALL.getStatus());
-        }else{
+        }else if(reqVO.getStatus() != null){
             queryWrapper.eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus());
             queryWrapper.ne(TradeOrderDO::getRefundStatus, TradeOrderRefundStatusEnum.ALL.getStatus());
         }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -133,7 +133,13 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
             return PageResult.empty();
         }
         // 分页查询
-        return tradeOrderMapper.selectPage(reqVO, userIds);
+        PageResult<TradeOrderDO> tradeOrderDOPageResult = tradeOrderMapper.selectPage(reqVO, userIds);
+        if (reqVO.getStatus().equals(TradeOrderStatusEnum.AFTER_SALE.getStatus())) {
+            for (TradeOrderDO tradeOrderDO : tradeOrderDOPageResult.getList()) {
+                tradeOrderDO.setStatus(TradeOrderStatusEnum.AFTER_SALE.getStatus());
+            }
+        }
+        return tradeOrderDOPageResult;
     }
 
     private Set<Long> buildQueryConditionUserIds(TradeOrderPageReqVO reqVO) {

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserRespVO.java

@@ -97,4 +97,7 @@ public class MemberUserRespVO extends MemberUserBaseVO {
 
     @Schema(description = "当前可用积分")
     private Long currentQuota;
+
+    @Schema(description = "峰值累计")
+    private Long highQuotaTotal;
 }