Merge branch 'dev/2024/0623/update-app-Y' of feifan/mall-backend-app into master

修改订单详情的可见单价

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/sharepath/vo/SharePathRespVO.java

@@ -73,7 +73,8 @@ public class SharePathRespVO {
     @Schema(description = "最高可获取积分(峰值 / 最大值)")
     private Long high_quota;
 
-    @Schema(description = "剩余的合赢奖额度 + 待确权直推奖")
+//    @Schema(description = "剩余的合赢奖额度 + 待确权直推奖")
+    @Schema(description = "分区额度")
     private Long residueSocial;
 
     @Schema(description = "用户名")

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

@@ -6,12 +6,13 @@ import cn.newfeifan.mall.module.distri.controller.app.sharepath.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.orderpercentage.OrderPercentageDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.partitioncrash.PartitionCrashDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatus.SocialStatusDO;
 import cn.newfeifan.mall.module.distri.dal.mysql.orderpercentage.OrderPercentageMapper;
+import cn.newfeifan.mall.module.distri.dal.mysql.partitioncrash.PartitionCrashMapper;
 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.partitioncrash.PartitionCrashService;
 import cn.newfeifan.mall.module.distri.service.socialstatus.SocialStatusService;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
@@ -30,6 +31,9 @@ import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.distri.dal.mysql.sharepath.SharePathMapper;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -68,7 +72,7 @@ public class SharePathServiceImpl implements SharePathService {
     private IntegralService integralService;
 
     @Resource
-    private PartitionCrashService partitionCrashService;
+    private PartitionCrashMapper partitionCrashMapper;
 
 
     @Override
@@ -205,13 +209,19 @@ public class SharePathServiceImpl implements SharePathService {
     }
 
     private Long getResidueSocial(Long userId){
-        if(!userId.equals(PT_ID)){
-            Long ancestorIncreaseIntegral = sharePathMapper.getAncestorIncreaseIntegralByUserId(userId);
-            if(ancestorIncreaseIntegral == null) ancestorIncreaseIntegral = 0L;
-            Long residueSocial = partitionCrashService.getResidueSocial(userId);
-            return ancestorIncreaseIntegral + residueSocial;
-        }
-        return 0L;
+//        if(!userId.equals(PT_ID)){
+//            Long ancestorIncreaseIntegral = sharePathMapper.getAncestorIncreaseIntegralByUserId(userId);
+//            if(ancestorIncreaseIntegral == null) ancestorIncreaseIntegral = 0L;
+//            Long residueSocial = partitionCrashService.getResidueSocial(userId);
+//            return ancestorIncreaseIntegral + residueSocial;
+//        }
+
+        LocalDateTime todayStart = LocalDateTime.of(LocalDate.now(), LocalTime.MIDNIGHT); // 今天的开始时间，即午夜12点
+        LocalDateTime localDateTime = todayStart.minusDays(1);
+        String yesterdayNo = "CRASH:" + userId + ":" + localDateTime.toString();
+        PartitionCrashDO yesterdayCrash = partitionCrashMapper.selectOne(new LambdaQueryWrapperX<PartitionCrashDO>().eqIfPresent(PartitionCrashDO::getPartNo, yesterdayNo));
+
+        return yesterdayCrash.getAfterHitQuota();
     }
 
     /**

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java

@@ -4,6 +4,7 @@ import cn.newfeifan.mall.module.trade.controller.app.base.property.AppProductPro
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Schema(description = "用户 App - 订单交易项 Response VO")
@@ -58,4 +59,7 @@ public class AppTradeOrderItemRespVO {
     @Schema(description = "售后状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer afterSaleStatus;
 
+    @Schema(description = "高精度价格", example = "29564")
+    private BigDecimal highPrecisionPrice;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderItemDO.java

@@ -179,7 +179,7 @@ public class TradeOrderItemDO extends BaseDO {
      */
     private Integer afterSaleStatus;
 
-    @TableField(exist = false)
+//    @TableField(exist = false)
     private BigDecimal highPrecisionPrice;
 
     /**