权益金为空判断

share-quartz/src/main/java/share/quartz/task/RedisTask.java

@@ -361,7 +361,8 @@ public class RedisTask {
                         if (ObjectUtil.isNotEmpty(consumerWallet)) {
                             //添加时长
                             BigDecimal anHour = new BigDecimal(1.0);
-                            consumerWallet.setRemainingDuration(consumerWallet.getRemainingDuration().add(anHour));
+                            BigDecimal accumulateEquityFund =  consumerWallet.getAccumulateEquityFund() != null ? consumerWallet.getAccumulateEquityFund() : BigDecimal.ZERO;
+                            consumerWallet.setRemainingDuration(accumulateEquityFund.add(anHour));
                             consumerWallet.setUpdateTime(DateUtils.getNowDate());
                             consumerWalletService.updateConsumerWallet(consumerWallet);
                             DurationLog durationLog = new DurationLog();
@@ -381,7 +382,7 @@ public class RedisTask {
                             newConsumerWallet.setEquityFund(defaultVlue);
                             newConsumerWallet.setAccumulateEquityFund(defaultVlue);
                             BigDecimal anHour = new BigDecimal(1.0);
-                            newConsumerWallet.setRemainingDuration(newConsumerWallet.getRemainingDuration().add(anHour));
+                            newConsumerWallet.setRemainingDuration(defaultVlue.add(anHour));
                             newConsumerWallet.setUpdateTime(DateUtils.getNowDate());
                             consumerWalletService.insertConsumerWallet(newConsumerWallet);
                             DurationLog newDurationLog = new DurationLog();
@@ -403,8 +404,8 @@ public class RedisTask {
                     //判断是否为权益会员和会员是否有效
                     if (YesNoEnum.yes.getIndex().equals(consumerMember.getIsRecharge()) && new Date().getTime() < consumerMember.getExpirationDate().getTime()
                             && YesNoEnum.yes.getIndex().equals(newConsumerMember.getIsRecharge()) && new Date().getTime() < newConsumerMember.getExpirationDate().getTime()) {
-                        Boolean aBoolean = redisTemplate.hasKey(ReceiptRdeisEnum.EQUITY_MEMBERS_TIME + sharingActivities.getUid().toString());
-                        Boolean newAboolean = redisTemplate.hasKey(ReceiptRdeisEnum.EQUITY_MEMBERS_TIME + sharingActivities.getNewUid().toString());
+                        Boolean aBoolean = redisTemplate.hasKey(ReceiptRdeisEnum.EQUITY_MEMBERS_TIME.getValue() + sharingActivities.getUid().toString());
+                        Boolean newAboolean = redisTemplate.hasKey(ReceiptRdeisEnum.EQUITY_MEMBERS_TIME.getValue() + sharingActivities.getNewUid().toString());
                         if (aBoolean && newAboolean) {
                             LambdaQueryWrapper<ConsumerWallet> consumerWalletLambdaQueryWrapper = new LambdaQueryWrapper<>();
                             consumerWalletLambdaQueryWrapper.eq(ConsumerWallet::getConsumerId, sharingActivities.getUid());
@@ -415,8 +416,10 @@ public class RedisTask {
                                 String equityFund = sysConfigService.selectConfigByKey("sys.equityFundLog.equityFund");
 //                                BigDecimal addEquityFund =  payPrice.multiply(new BigDecimal(equityFund)).setScale(2, RoundingMode.HALF_UP);
                                 BigDecimal addEquityFund =  new BigDecimal(99).multiply(new BigDecimal(equityFund)).setScale(2, RoundingMode.HALF_UP);
-                                consumerWallet.setEquityFund(consumerWallet.getEquityFund().add(addEquityFund));
-                                consumerWallet.setAccumulateEquityFund(consumerWallet.getAccumulateEquityFund().
+                                BigDecimal aEquityFund =  consumerWallet.getEquityFund() != null ? consumerWallet.getEquityFund() : BigDecimal.ZERO;
+                                consumerWallet.setEquityFund(aEquityFund.add(addEquityFund));
+                                BigDecimal accumulateEquityFund =  consumerWallet.getAccumulateEquityFund() != null ? consumerWallet.getAccumulateEquityFund() : BigDecimal.ZERO;
+                                consumerWallet.setAccumulateEquityFund(accumulateEquityFund.
                                         add(addEquityFund));
                                 consumerWallet.setUpdateTime(DateUtils.getNowDate());
                                 consumerWalletService.updateConsumerWallet(consumerWallet);
@@ -622,7 +625,7 @@ public class RedisTask {
     @XxlJob("AutoEquityMembersSms")
     public void AutoEquityMembersSms() {
         logger.debug("AutoEquityMembersSms:自动发送权益会员过期短信开始");
-        Set<String> keys = redisTemplate.keys(ReceiptRdeisEnum.EQUITY_MEMBERS_TIME + "*");
+        Set<String> keys = redisTemplate.keys(ReceiptRdeisEnum.EQUITY_MEMBERS_TIME.getValue() + "*");
         if (keys.size() == 0) {
             return;
         }

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

@@ -777,7 +777,7 @@ public class CallbackServiceImpl implements CallbackService {
             ConsumerMember consumerMember = consumerMemberService.getOne(consumerMemberLambdaQueryWrapper);
             //判断是否为权益会员和会员是否有效
             if (YesNoEnum.yes.getIndex().equals(consumerMember.getIsRights()) && new Date().getTime() < consumerMember.getExpirationDate().getTime()) {
-                Boolean aBoolean = redisTemplate.hasKey(ReceiptRdeisEnum.EQUITY_MEMBERS_TIME + sharingActivities.getUid().toString());
+                Boolean aBoolean = redisTemplate.hasKey(ReceiptRdeisEnum.EQUITY_MEMBERS_TIME.getValue() + sharingActivities.getUid().toString());
                 if (aBoolean) {
 
                     String equityFund = sysConfigService.selectConfigByKey("sys.equityFundLog.equityFund");
@@ -788,22 +788,24 @@ public class CallbackServiceImpl implements CallbackService {
                     ConsumerWallet consumerWallet = consumerWalletService.getOne(new LambdaQueryWrapper<ConsumerWallet>()
                             .eq(ConsumerWallet::getConsumerId, sharingActivities.getUid()));
                     if (ObjectUtil.isNotEmpty(consumerWallet)) {
-                        consumerWallet.setEquityFund(consumerWallet.getEquityFund().add(addEquityFund));
-                        consumerWallet.setAccumulateEquityFund(consumerWallet.getAccumulateEquityFund().
+                        BigDecimal aEquityFund =  consumerWallet.getEquityFund() != null ? consumerWallet.getEquityFund() : BigDecimal.ZERO;
+                        consumerWallet.setEquityFund(aEquityFund.add(addEquityFund));
+                        BigDecimal accumulateEquityFund =  consumerWallet.getAccumulateEquityFund() != null ? consumerWallet.getAccumulateEquityFund() : BigDecimal.ZERO;
+                        consumerWallet.setAccumulateEquityFund(accumulateEquityFund.
                                 add(addEquityFund));
                         consumerWallet.setUpdateTime(DateUtils.getNowDate());
                         consumerWalletService.updateConsumerWallet(consumerWallet);
                     } else {
                         //新增钱包
                         ConsumerWallet newConsumerWallet = new ConsumerWallet();
-                        BigDecimal defaultVlue = new BigDecimal(0.0);
+                        BigDecimal defaultVlue = new BigDecimal(0);
                         newConsumerWallet.setConsumerId(sharingActivities.getUid());
                         newConsumerWallet.setBalance(defaultVlue);
                         newConsumerWallet.setRemainingIntegral(defaultVlue);
                         newConsumerWallet.setRemainingDuration(defaultVlue);
-                        newConsumerWallet.setEquityFund(consumerWallet.getEquityFund()
+                        newConsumerWallet.setEquityFund(defaultVlue
                                 .add(addEquityFund));
-                        newConsumerWallet.setAccumulateEquityFund(consumerWallet.getAccumulateEquityFund().add(addEquityFund));
+                        newConsumerWallet.setAccumulateEquityFund(defaultVlue.add(addEquityFund));
                         consumerWalletService.insertConsumerWallet(newConsumerWallet);
                     }
                     //添加权益金日志记录
@@ -812,7 +814,7 @@ public class CallbackServiceImpl implements CallbackService {
                     //上级用户
                     SConsumer consumer = consumerService.getById(sharingActivities.getUid());
                     EquityFundLog equityFundLog = new EquityFundLog();
-                    equityFundLog.setEquityFund(payPrice.multiply(new BigDecimal(equityFund).setScale(2, RoundingMode.HALF_UP)));
+                    equityFundLog.setEquityFund(addEquityFund);
                     equityFundLog.setEquityFundType(type);
                     equityFundLog.setOutTradeNo(equityOrderNo);
                     equityFundLog.setTerminalTrace(terminalTrace);