Bläddra i källkod

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

修改可见的积分详情
Yangzw 10 månader sedan
förälder
incheckning
02f385fe72

+ 1 - 1
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());

+ 10 - 6
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());
@@ -141,12 +141,16 @@ public class MemberUserServiceImpl implements MemberUserService {
 //    @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