修改测试写死代码

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

@@ -351,7 +351,7 @@ public class RedisTask {
                     sOrderLambdaQueryWrapper.eq(SOrder::getConsumerId, sOrder.getConsumerId());
                     sOrderLambdaQueryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
                     sOrderLambdaQueryWrapper.notIn(SOrder::getRefundStatus, RefundStatusEnum.getRefundedStatus());
-                    sOrderLambdaQueryWrapper.in(SOrder::getStatus, OrderStatusEnum.getUnfinishOrderStatus());
+                    sOrderLambdaQueryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus());
                     sOrderLambdaQueryWrapper.eq(SOrder::getIsDelete, YesNoEnum.no.getIndex());
                     List<SOrder> sOrderList = isOrderService.list(sOrderLambdaQueryWrapper);
                     if (sOrderList.size() == 1) {
@@ -399,11 +399,11 @@ public class RedisTask {
                     consumerMemberWrapper.eq(ConsumerMember::getConsumerId, sharingActivities.getUid());
                     ConsumerMember consumerMember = consumerMemberService.getOne(consumerMemberWrapper);
                     LambdaQueryWrapper<ConsumerMember> newConsumerMemberQueryWrapper = new LambdaQueryWrapper<>();
-                    newConsumerMemberQueryWrapper.eq(ConsumerMember::getConsumerId, sharingActivities.getUid());
+                    newConsumerMemberQueryWrapper.eq(ConsumerMember::getConsumerId, sharingActivities.getNewUid());
                     ConsumerMember newConsumerMember = consumerMemberService.getOne(newConsumerMemberQueryWrapper);
                     //判断是否为权益会员和会员是否有效
-                    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()) {
+                    if (YesNoEnum.yes.getIndex().equals(consumerMember.getIsRights()) && new Date().getTime() < consumerMember.getExpirationDate().getTime()
+                            && YesNoEnum.yes.getIndex().equals(newConsumerMember.getIsRights()) && new Date().getTime() < newConsumerMember.getExpirationDate().getTime()) {
                         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) {
@@ -414,8 +414,8 @@ public class RedisTask {
                             if (payPrice.signum() > 0) {
 
                                 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);
+                                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);
                                 BigDecimal aEquityFund =  consumerWallet.getEquityFund() != null ? consumerWallet.getEquityFund() : BigDecimal.ZERO;
                                 consumerWallet.setEquityFund(aEquityFund.add(addEquityFund));
                                 BigDecimal accumulateEquityFund =  consumerWallet.getAccumulateEquityFund() != null ? consumerWallet.getAccumulateEquityFund() : BigDecimal.ZERO;