Merge branch 'dev/2024/0620/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

@@ -23,9 +23,10 @@ public enum CaclEnum {
     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL(16,"手动取消支付返回","取消订单，退回积分"),
     ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL(17,"支付超时返回","订单超时未支付，退回积分"),
     ORDER_PAY_INTEGRAL_ANCESTER(18, "直推奖获得","直推人购物,推荐人获得冻结积分"),//购物 上级直推人 获得积分
-    ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款","订单退款，收回消费者获得的冻结积分"),
-    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款","订单退款，收回消费者的推荐人，获得的冻结积分"),
+    ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款-撤回购物获得","订单退款，收回消费者获得的冻结积分"),
+    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款-撤回直推奖","订单退款，收回消费者的推荐人，获得的冻结积分"),
     ORDER_PAY_INTEGRAL_CONSUMER(21, "购物获得","消费者购物,获得冻结积分"),//购物者本人 获得积分
+    SMALL_QUOTA_CRASH_SETTLE(22, "合赢奖结算获得","每天计算的合赢奖7天后结算"),
     ;
 
     /**

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

@@ -32,7 +32,7 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
             profitStatus = Arrays.asList(
                     RECOMMENDED_PERSON_QUOTA.getType(),
                     DIRECT_REFERRAL_QUOTA.getType(),
-                    SMALL_QUOTA_CRASH.getType(),
+                    SMALL_QUOTA_CRASH_SETTLE.getType(),
                     ORDER_PAY_INTEGRAL.getType(),
                     ORDER_REFUND_INTEGRAL.getType(),
                     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL.getType(),
@@ -43,6 +43,7 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
             profitStatus = Arrays.asList(
                     RECOMMENDED_PERSON_QUOTA.getType(),
                     DIRECT_REFERRAL_QUOTA.getType(),
+                    SMALL_QUOTA_CRASH.getType(),
                     ORDER_PAY_INTEGRAL_ANCESTER.getType(),
                     ORDER_REFUND_INTEGRAL_CONSUMER.getType(),
                     ORDER_REFUND_INTEGRAL_ANCESTER.getType(),
@@ -55,6 +56,7 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                     PLATFORM_TOTAL_ADD.getType(),
                     PLATFORM_SERVICE_FEE.getType(),
                     PLATFORM_REVENUE.getType(),
+                    SMALL_QUOTA_CRASH_SETTLE.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(),
@@ -81,7 +83,8 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                 .eqIfPresent(PtProfitLogDO::getPercentTemplate, reqVO.getPercentTemplate())
                 .eqIfPresent(PtProfitLogDO::getUserId, reqVO.getUserId())
                 .inIfPresent(PtProfitLogDO::getProfitStatus, profitStatus)
-                .orderByDesc(PtProfitLogDO::getCreateTime);
+                .orderByDesc(PtProfitLogDO::getCreateTime)
+                .orderByDesc(PtProfitLogDO::getId);
         return selectPage(reqVO, queryWrapper);
     }
 

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

@@ -101,16 +101,18 @@ public class SharePathServiceImpl implements SharePathService {
         duserService.hasUserAndCreat(createReqVO);
 
         // 存储他们之间的关系
-        sharePathMapper.addNode(
-                createReqVO.getAncestor(),
-                ancestor.getName(),
-                ancestor.getNickname(),
-                ancestor.getMobile(),
-
-                createReqVO.getDescendant(),
-                descendant.getName(),
-                descendant.getNickname(),
-                descendant.getMobile());
+        if (!Objects.equals(createReqVO.getDescendant(), PT_ID)) {
+            sharePathMapper.addNode(
+                    createReqVO.getAncestor(),
+                    ancestor.getName(),
+                    ancestor.getNickname(),
+                    ancestor.getMobile(),
+
+                    createReqVO.getDescendant(),
+                    descendant.getName(),
+                    descendant.getNickname(),
+                    descendant.getMobile());
+        }
 
         OrderPercentageDO orderPercentageDO = orderPercentageMapper.selectList().get(0);
         duserService.updateDuserSocial(createReqVO.getAncestor(), Long.valueOf(orderPercentageDO.getRegisterAncestorSocialStatus()), SocialStatusEnum.REGISTER_ANCESTOR_SOCIAL.getStatus());

feifan-module-member/feifan-module-member-api/src/main/java/cn/newfeifan/mall/module/member/enums/ErrorCodeConstants.java

@@ -59,6 +59,8 @@ public interface ErrorCodeConstants {
     ErrorCode AUTH_USERNAME_EXISTS = new ErrorCode(1_004_012_003, "此用户名已经存在,请换一个!");
     ErrorCode MOBILE_IS_MAXIMIZE = new ErrorCode(1_004_012_004, "此手机号已经达到注册的上限了");
     ErrorCode AUTH_SOCIAL_USER_BIND_MAX = new ErrorCode(1_004_012_004, "此微信号已经到达绑定的上限了");
+    ErrorCode LINK_ID_IS_NOT_EXISTS = new ErrorCode(1_004_012_005, "只能通过分享注册");
+    ErrorCode RELOAD_REGISTER = new ErrorCode(1_004_012_006, "本次注册账号失败,请退出当前页面重新扫描分享二维码注册");
 
     ErrorCode LINK_ID_IS_NOT_EXISTS = new ErrorCode(1_004_012_005, "只能通过分享注册");
     ErrorCode RELOAD_REGISTER = new ErrorCode(1_004_012_006, "本次注册账号失败,请退出当前页面重新扫描分享二维码注册");

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

@@ -329,7 +329,6 @@ public class MemberAuthServiceImpl implements MemberAuthService {
 
     /**
      * 校验手机号是否达到上限
-     *
      * @param mobile 手机号
      */
     private void verifyMobileIsMaximize(String mobile) {

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserServiceImpl.java

@@ -137,6 +137,21 @@ public class MemberUserServiceImpl implements MemberUserService {
         return user;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void registerTransactionSynchronization(Long userId, Long linkId) {
+        // 发送 消息：用户创建
+        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+            @Override
+            public void afterCommit() {
+                sharePathProducer.sendSharePathCreatMessage(linkId, userId);
+                if (linkId != null) {
+                    shareLinkRegisterProducer.sendShareLinkRegisterMessage(linkId, userId);
+                }
+                memberUserProducer.sendUserCreateMessage(userId);
+            }
+        });
+    }
+
     //现在这个不用了
 //    @Transactional(rollbackFor = Exception.class)
 //    public void registerTransactionSynchronization(Long userId, Long linkId) {

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/config/SystemConfigServiceImpl.java

@@ -9,6 +9,7 @@ import cn.newfeifan.mall.module.system.controller.admin.config.vo.ConfigSaveReqV
 import cn.newfeifan.mall.module.system.dal.dataobject.config.SystemConfigDO;
 import cn.newfeifan.mall.module.system.dal.mysql.config.SystemConfigMapper;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -34,6 +35,7 @@ public class SystemConfigServiceImpl implements SystemConfigService {
     @Resource
     private StringRedisTemplate stringRedisTemplate;
     @Resource
+    @Lazy
     private StartConfig startConfig;
 
     @Override

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/wechatmsgtemplate/WechatMsgTemplateServiceImpl.java

@@ -9,6 +9,7 @@ import cn.newfeifan.mall.module.system.controller.admin.wechatmsgtemplate.vo.Wec
 import cn.newfeifan.mall.module.system.dal.dataobject.wechatmsgtemplate.WechatMsgTemplateDO;
 import cn.newfeifan.mall.module.system.dal.mysql.wechatmsgtemplate.WechatMsgTemplateMapper;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +38,7 @@ public class WechatMsgTemplateServiceImpl implements WechatMsgTemplateService {
     private StringRedisTemplate stringRedisTemplate;
 
     @Resource
+    @Lazy
     private StartConfig startConfig;
 
     @Override

feifan-server/src/main/resources/application.yaml

@@ -3,7 +3,7 @@ spring:
     name: feifan-server
 
   profiles:
-    active: prod
+    active: local
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
@@ -243,12 +243,12 @@ feifan:
   sms-code: # 短信验证码相关的配置项
     expire-times: 10m
     send-frequency: 1m
-    send-maximum-quantity-per-day: 10
+    send-maximum-quantity-per-day: 40
     begin-code: 0000 # 这里配置 0000(修改后)。
     end-code: 9999 # 这里配置 9999 的原因是，测试方便。
   trade:
     order:
-      app-id: 11 # 商户编号
+      app-id: 1 # 商户编号
       pay-expire-time: 2h # 支付的过期时间
       receive-expire-time: 14d # 收货的过期时间
       comment-expire-time: 7d # 评论的过期时间