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

修改登录系统

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/CaclEnum.java

@@ -6,21 +6,24 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum CaclEnum {
+    PLATFORM_TOTAL_ADD(0, "平台总收益"),
     PLATFORM_SERVICE_FEE(1, "平台服务费"),
     PLATFORM_REVENUE(2, "平台收益"),
-    RECOMMENDED_PERSON_QUOTA(3, "推荐人额度"),
-    DIRECT_REFERRAL_QUOTA(4, "直推人额度"),
+    RECOMMENDED_PERSON_QUOTA(3, "直推奖获得"),
+    DIRECT_REFERRAL_QUOTA(4, "用户自得额度"),
     TOGETHER_AWARD(5, "合赢奖"),
     HIGH_QUOTA(6, "最高可以获得积分"),
-    SMALL_QUOTA_CRASH(7, "小区额度分配"),
+    SMALL_QUOTA_CRASH(7, "合赢奖获得"),
     AFTER_CRASH_CALC_PT_TOTAL_QUOTA(8, "碰撞后计算平台总收益"),
-    ORDER_PAY_INTEGRAL(9,"购物使用积分"),//支付了一部分积分作购物用
-    ORDER_REFUND_INTEGRAL(10,"订单退款，积分退回"),//订单已支付，用户退款申请通过，则退回商品项使用的积分
-    ORDER_INTEGRAL_UNFREEZE(11,"订单积分到账"),//购物收货7天后，冻结积分变为可用积分
-    ORDER_GET_FREEZE_INTEGRAL(12,"购物返积分"),//购物获得冻结积分
-    ORDER_CANCEL_BY_USER_REFUND_INTEGRAL(13,"取消订单，退回积分"),//用户手动取消未支付订单，退回购物使用的积分
-    ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL(14,"订单超时未支付，退回积分"),//订单超时未支付，退回购物使用的积分
-    ORDER_REFUND_CANCEL_INTEGRAL(15,"订单退款，减少冻结积分")//订单已支付，用户退款申请通过，则减少之前给用户的冻结积分
+    ORDER_PAY_INTEGRAL(9, "购物获得冻结积分"),
+    ORDER_REFUND_INTEGRAL(10, "订单退款，积分退回"),
+    ORDER_INTEGRAL_UNFREEZE(11, "订单积分到账"),
+    AFTER_CRASH_CALC_PT_TOTAL_GROSS_QUOTA(12, "碰撞后计算平台收益"),
+    FREEZE_CHANGE_INTEGRAL(13, "冻结积分转化成可用积分"),
+    GROSS_PROFIT_BONUS_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT(14, "合赢奖超额"),
+    GROSS_PROFIT_ANCESTOR_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT(15, "直推奖超额"),
+    ORDER_CANCEL_BY_USER_REFUND_INTEGRAL(16,"取消订单，退回积分"),
+    ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL(17,"订单超时未支付，退回积分")
     ;
 
     /**

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ptprofitlog/PtProfitLogMapper.java

@@ -8,6 +8,13 @@ import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitlog.PtProfitLogDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.newfeifan.mall.module.distri.controller.app.ptprofitlog.vo.*;
 
+import java.util.Arrays;
+import java.util.List;
+
+import static cn.newfeifan.mall.module.distri.constant.DistriConstants.PT_ID;
+import static cn.newfeifan.mall.module.distri.enums.CaclEnum.*;
+import static cn.newfeifan.mall.module.distri.enums.CaclEnum.GROSS_PROFIT_ANCESTOR_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT;
+
 /**
  * 平台利润记录 Mapper
  *
@@ -17,24 +24,49 @@ import cn.newfeifan.mall.module.distri.controller.app.ptprofitlog.vo.*;
 public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
 
     default PageResult<PtProfitLogDO> selectPage(PtProfitLogPageReqVO reqVO) {
+        //用户只能查看这些类型
+        List<Integer> profitStatus = null;
+
+        if (!reqVO.getIsFreeze()) {
+            profitStatus = Arrays.asList(
+                    RECOMMENDED_PERSON_QUOTA.getType(),
+                    DIRECT_REFERRAL_QUOTA.getType(),
+                    ORDER_PAY_INTEGRAL.getType(),
+                    FREEZE_CHANGE_INTEGRAL.getType(),
+                    SMALL_QUOTA_CRASH.getType());
+        } else {
+            profitStatus = Arrays.asList(
+                    DIRECT_REFERRAL_QUOTA.getType(),
+                    ORDER_PAY_INTEGRAL.getType());
+        }
+
+        if (!reqVO.getIsFreeze() && reqVO.getUserId().equals(PT_ID)) {
+            profitStatus = Arrays.asList(
+                    PLATFORM_TOTAL_ADD.getType(),
+                    PLATFORM_SERVICE_FEE.getType(),
+                    PLATFORM_REVENUE.getType(),
+                    AFTER_CRASH_CALC_PT_TOTAL_QUOTA.getType(),
+                    AFTER_CRASH_CALC_PT_TOTAL_GROSS_QUOTA.getType(),
+                    GROSS_PROFIT_BONUS_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType(),
+                    GROSS_PROFIT_ANCESTOR_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType()
+            );
+            reqVO.setUserId(null);
+        } else if (reqVO.getIsFreeze() && reqVO.getUserId().equals(PT_ID)) {
+            profitStatus = Arrays.asList(
+                    DIRECT_REFERRAL_QUOTA.getType(),
+                    ORDER_PAY_INTEGRAL.getType()
+            );
+            reqVO.setUserId(null);
+        }
+
         LambdaQueryWrapperX<PtProfitLogDO> queryWrapper = new LambdaQueryWrapperX<PtProfitLogDO>()
                 .eqIfPresent(PtProfitLogDO::getAmount, reqVO.getAmount())
                 .eqIfPresent(PtProfitLogDO::getAfterAmount, reqVO.getAfterAmount())
                 .eqIfPresent(PtProfitLogDO::getOrderId, reqVO.getOrderId())
                 .eqIfPresent(PtProfitLogDO::getPercentTemplate, reqVO.getPercentTemplate())
                 .eqIfPresent(PtProfitLogDO::getUserId, reqVO.getUserId())
+                .inIfPresent(PtProfitLogDO::getProfitStatus, profitStatus)
                 .orderByDesc(PtProfitLogDO::getCreateTime);
-        if(!reqVO.getIsFreeze()){
-            queryWrapper
-                    .isNotNull(PtProfitLogDO::getAmount)
-                    .ne(PtProfitLogDO::getAmount,0)
-            ;
-        }else{
-            queryWrapper
-                    .isNotNull(PtProfitLogDO::getFreezeAmount)
-                    .ne(PtProfitLogDO::getFreezeAmount,0)
-            ;
-        }
         return selectPage(reqVO, queryWrapper);
     }
 }

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

@@ -975,7 +975,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
 //            Integer freezeAmount = promotionExpenses2GrossProfitAncestorQuota(orderPercentageMapper,totalPromotionExpenses);
 
             String OrderNum =order.getNo();
-            integralService.updateUserIntegral(tradeOrderDO.getUserId(), CaclEnum.ORDER_GET_FREEZE_INTEGRAL, 0l,totalFreezeAmount,tradeOrderId,OrderNum);
+            integralService.updateUserIntegral(tradeOrderDO.getUserId(), CaclEnum.ORDER_PAY_INTEGRAL, 0l,totalFreezeAmount,tradeOrderId,OrderNum);
 
             allTradeOrderTotalFreezeAmount+=totalFreezeAmount;//用户获得总的待确权冻结积分
 

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/auth/vo/AppAuthSocialRegisterReqVO.java

@@ -12,7 +12,6 @@ public class AppAuthSocialRegisterReqVO  extends AppAuthSocialLoginReqVO{
     private String linkId;
 
     @Schema(description = "用户名")
-    @NotNull(message = "用户名不能为空")
     private String username;
 
     public Long getLinkId() {

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/auth/MemberAuthServiceImpl.java

@@ -115,7 +115,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         }
 
         //重名校验
-        if (userService.selectCountByUsername(reqVO.getUsername()) > 0) {
+        if (reqVO.getUsername().isEmpty() || userService.selectCountByUsername(reqVO.getUsername()) > 0) {
             throw exception(AUTH_USERNAME_EXISTS);
         }
 

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/social/SocialUserServiceImpl.java

@@ -211,7 +211,7 @@ public class SocialUserServiceImpl implements SocialUserService {
         }
         String json = stringRedisTemplate.opsForValue().get("auth_user:" + code);
         if (json != null) {
-            stringRedisTemplate.delete("auth_user:" + code);
+//            stringRedisTemplate.delete("auth_user:" + code);
             // 从JSON字符串中安全地解析AuthUser对象
             return JSONObject.parseObject(json,AuthUser.class);
         }