修改充值回调

share-system/src/main/java/share/system/service/impl/ConsumerWalletServiceImpl.java

@@ -345,7 +345,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
             integralLog.setOperationTime(new Date());
             integralLog.setCreateTime(new Date());
             integralLog.setOperationType(YesNoEnum.yes.getIndex());
-            integralLogService.save(integralLog);
+            ;
             MemberProgressLog memberProgressLog = new MemberProgressLog();
             memberProgressLog.setConsumerId(consumerWallet.getConsumerId());
             memberProgressLog.setCurrentProgress(one.getMembershipProgress());
@@ -354,7 +354,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
             memberProgressLog.setOperationType(YesNoEnum.yes.getIndex());
             memberProgressLog.setCreateTime(new Date());
             memberProgressLog.setExpirationTime(DateUtils.addYears(new Date(), memberConfig.getValidityPeriod().intValue()));
-            memberProgressLogService.save(memberProgressLog);
+            if (memberProgressLogService.save(memberProgressLog) && integralLogService.save(integralLog)) {
             List<MemberConfig> list = memberConfigService.list(new LambdaQueryWrapper<MemberConfig>()
                     .eq(MemberConfig::getMemberType, one.getMemberType())
                     .orderBy(true, false, MemberConfig::getMembershipLevel));
@@ -363,15 +363,27 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
             //判断consumption[0]大于某个等级的积分，并小于下一等级的积分或者大于最大等级
             for (Map.Entry<Long, MemberConfig> entry : memberConfigMap.entrySet()) {
                 if (consumption[0].compareTo(BigDecimal.valueOf(entry.getValue().getLimitRequirements())) >= 0 &&
-                        (consumption[0].compareTo(BigDecimal.valueOf(memberConfigMap.get(entry.getKey() + 1).getLimitRequirements())) < 0 ||
-                                consumption[0].compareTo(BigDecimal.valueOf(memberConfigMap.get(Collections.max(memberConfigMap.keySet())).getLimitRequirements())) >= 0)) {
+                        consumption[0].compareTo(BigDecimal.valueOf(memberConfigMap.get(entry.getKey() + 1).getLimitRequirements())) < 0
+                        && entry.getKey().compareTo(Collections.max(memberConfigMap.keySet())) < 0) {
                     one.setMembershipLevel(entry.getKey());
                     one.setMemberConfigId(entry.getValue().getId());
-                    consumerMemberService.updateById(one);
-                }
-            }
+                    one.setMembershipProgress(consumption[0].add(one.getMembershipProgress()));
+                    consumerMemberService.updateConsumerMember(one);
+                    consumerWallet.setRemainingIntegral(consumerWallet.getRemainingIntegral().add(consumption[0]));
+                    consumerWalletMapper.updateConsumerWallet(consumerWallet);
+                    return;
+                } else if (consumption[0].compareTo(BigDecimal.valueOf(memberConfigMap.get(Collections.max(memberConfigMap.keySet())).getLimitRequirements())) >= 0) {
+                    one.setMembershipLevel(Collections.max(memberConfigMap.keySet()));
+                    one.setMemberConfigId(memberConfigMap.get(Collections.max(memberConfigMap.keySet())).getId());
+                    one.setMembershipProgress(consumption[0].add(one.getMembershipProgress()));
+                    consumerMemberService.updateConsumerMember(one);
                     consumerWallet.setRemainingIntegral(consumerWallet.getRemainingIntegral().add(consumption[0]));
                     consumerWalletMapper.updateConsumerWallet(consumerWallet);
+                    return;
+                }
+            }
+
+            }
         }
     }