Merge branch 'master' of http://47.107.29.61:3000/feifan/mall-backend-app into dev/2024/0620/update-app-Y

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

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

@@ -702,7 +702,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
                 TradePriceCalculateRespBO.OrderItem orderItemTmp = itemPayPointsMap.get(skuId);
                 orderItem.setPayIntegral(orderItemTmp.getPayPoints()); //本商品使用积分
                 Integer payRmb;
-                if (orderItem.getHighPrecisionPrice() == null) {
+                if (orderItem.getHighPrecisionPrice().compareTo(BigDecimal.ZERO) == 0) {
                     payRmb = orderItem.getPrice() * orderItem.getCount() - integral2Money(orderItemTmp.getPayPoints());//本商品实付人民币
                 } else {
                     double rmb = (orderItem.getHighPrecisionPrice().doubleValue() * orderItem.getCount()) - integral2Money(orderItemTmp.getPayPoints());

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

@@ -62,4 +62,7 @@ public interface ErrorCodeConstants {
     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/user/MemberUserServiceImpl.java

@@ -124,7 +124,7 @@ public class MemberUserServiceImpl implements MemberUserService {
         memberUserMapper.insert(user);
 
         // 如果注册的时候关系链创建失败则需要返回让用户重新注册
-        try{
+        try {
             sharePathProducer.sendSharePathCreatMessage(linkId, user.getId());
             if (linkId != null) {
                 shareLinkRegisterProducer.sendShareLinkRegisterMessage(linkId, user.getId());
@@ -137,16 +137,35 @@ 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) {
 //        // 发送 消息：用户创建
-//            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
-//                @Override
-//                public void afterCommit() {
-//
+//        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+//            @Override
+//            public void afterCommit() {
+//                sharePathProducer.sendSharePathCreatMessage(linkId, userId);
+//                if (linkId != null) {
+//                    shareLinkRegisterProducer.sendShareLinkRegisterMessage(linkId, userId);
 //                }
-//            });
+//                memberUserProducer.sendUserCreateMessage(userId);
+//            }
+//        });
 //    }
 
     @Override