Merge branch 'dev' into test

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

@@ -802,6 +802,31 @@ public class RedisTask {
         logger.debug("AutomaticallyMonthlyCard:自动结束月卡结束");
     }
 
+    //每日00:00:00增加时长
+    @XxlJob("AutoMonthlyCardTime")
+    public void AutoMonthlyCardTime() {
+        logger.debug("AutoMonthlyCardTime:自动增加月卡时长开始");
+        Set<String> keys = redisTemplate.keys(ReceiptRdeisEnum.MONTHLY_CARD.getValue() + "*");
+        if (keys.size() == 0) return;
+        List<ConsumerMonthlyCard> consumerMonthlyCards = new ArrayList<>();
+        String monthlyCardTime = sysConfigService.selectConfigByKey("monthlyCardTime");
+        keys.stream().forEach(key -> {
+            String value = redisUtil.get(String.valueOf(key));
+            JSONObject jsonObject = new JSONObject(value);
+            Date expirationTime = jsonObject.getDate("expirationTime");
+            Long consumerMonthlyCardId = jsonObject.getLong("consumerMonthlyCardId");
+            if (expirationTime.getTime() > new Date().getTime()) {
+                ConsumerMonthlyCard consumerMonthlyCard = new ConsumerMonthlyCard();
+                consumerMonthlyCard.setFreeDuration(new BigDecimal(monthlyCardTime));
+                consumerMonthlyCard.setId(consumerMonthlyCardId);
+                consumerMonthlyCards.add(consumerMonthlyCard);
+            }
+        });
+        if (!CollectionUtils.isEmpty(consumerMonthlyCards))
+            consumerMonthlyCardService.updateBatchById(consumerMonthlyCards);
+        logger.debug("AutoMonthlyCardTime:自动增加月卡时长结束");
+    }
+
     @XxlJob("AutomaticallySecondaryCard")
     public void AutomaticallySecondaryCard() {
         logger.debug("AutomaticallySecondaryCard:自动结束次卡开始");

share-system/src/main/java/share/system/domain/MonthlyCardConf.java

 package share.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -25,6 +23,7 @@ public class MonthlyCardConf extends BaseEntity {
     /**
      * 主键
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

share-system/src/main/java/share/system/domain/MonthlyCardLog.java

 package share.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -27,6 +25,7 @@ public class MonthlyCardLog extends BaseEntity {
     /**
      * 主键
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

share-system/src/main/java/share/system/domain/SecondaryCardConf.java

 package share.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import share.common.annotation.Excel;
 import share.common.core.domain.BaseEntity;
@@ -23,6 +21,7 @@ public class SecondaryCardConf extends BaseEntity {
     /**
      * 主键
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

share-system/src/main/java/share/system/domain/SecondaryCardLog.java

 package share.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -26,6 +24,7 @@ public class SecondaryCardLog extends BaseEntity {
     /**
      * 主键
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

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

@@ -130,7 +130,7 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
 
         if (ObjectUtil.isNotEmpty(consumerMember)) {
             SRoom room = roomService.getById(monthlyCardRequest.getRoomId());
-            consumerMonthlyCard = baseMapper.selectOne(new LambdaQueryWrapper<ConsumerMonthlyCard>().eq(ConsumerMonthlyCard::getConsumerId, user.getId()));
+            consumerMonthlyCard = baseMapper.selectOne(new LambdaQueryWrapper<ConsumerMonthlyCard>().eq(ConsumerMonthlyCard::getConsumerId, user.getId()).gt(ConsumerMonthlyCard::getFreeDuration, 0));
             consumerSecondaryCard = consumerSecondaryCardService.list(new LambdaQueryWrapper<ConsumerSecondaryCard>().eq(ConsumerSecondaryCard::getConsumerId, user.getId()).orderByAsc(ConsumerSecondaryCard::getNumber));
             if (!ObjectUtils.isEmpty(monthlyCardRequest.getRoomLabelId())) {
                 RoomLabel roomLabel = roomLabelService.selectRoomLabelById(monthlyCardRequest.getRoomLabelId());
@@ -165,6 +165,10 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                                 }
                             });
                         }
+                        if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && consumerMonthlyCard.getFreeDuration().compareTo(new BigDecimal(byId.getDuration())) == 0) {
+                            consumerMonthlyCardList.add(consumerMonthlyCard.getId());
+                            map.put("consumerMonthlyCard", consumerMonthlyCardList);
+                        }
                         return map;
                         //标签绑定了套餐，套餐没开启，小时
                     } else {
@@ -188,6 +192,10 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                         }
                     });
                 }
+                if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && consumerMonthlyCard.getFreeDuration().compareTo(new BigDecimal(pack.getDuration())) == 0) {
+                    consumerMonthlyCardList.add(consumerMonthlyCard.getId());
+                    map.put("consumerMonthlyCard", consumerMonthlyCardList);
+                }
             }
         }
         return new HashMap<>();

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

@@ -53,6 +53,7 @@ import share.system.service.*;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.*;
@@ -991,12 +992,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 response.setOrderNo(sOrder.getOrderNo());
                 sOrder.setPayStatus(YesNoEnum.yes.getIndex());
                 sOrder.setPayTime(DateUtils.getNowDate());
-                if (ObjectUtils.isEmpty(request.getMonthlyCardId()) && ObjectUtils.isEmpty(request.getSecondaryCardId())) {
-                    creatExtracted(consumerWallet, sOrder, consumerMember);
-                } else {
+                if (!ObjectUtils.isEmpty(request.getMonthlyCardId()) || !ObjectUtils.isEmpty(request.getSecondaryCardId())) {
                     creatExtracted(consumerMonthlyCard, sOrder, consumerSecondaryCard);
                 }
-
+                creatExtracted(consumerWallet, sOrder, consumerMember);
             } else {
 //            response = orderPayService.payment(sOrder);
                 // 扫呗聚合支付
@@ -1132,7 +1131,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 
     private void creatExtracted(ConsumerWallet consumerWallet, SOrder sOrder, ConsumerMember consumerMember) {
         if (ObjectUtil.isNotEmpty(consumerWallet)) {
-            if (ObjectUtil.isNotEmpty(sOrder.getDuration()) && sOrder.getDuration().compareTo(BigDecimal.ZERO) > 0) {
+            if (ObjectUtil.isNotEmpty(sOrder.getDuration()) && sOrder.getDuration().compareTo(BigDecimal.ZERO) > 0 && ObjectUtil.isEmpty(sOrder.getMonthlyCardId())) {
                 DurationLog durationLog = new DurationLog();
                 durationLog.setConsumerId(sOrder.getConsumerId());
                 durationLog.setVariableDuration(sOrder.getDuration());
@@ -1357,7 +1356,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 
     private void refundExtracted(ConsumerWallet consumerWallet, SOrder sOrder, ConsumerMember consumerMember) {
         if (ObjectUtil.isNotEmpty(consumerWallet)) {
-            if (ObjectUtil.isNotEmpty(sOrder.getDuration()) && sOrder.getDuration().compareTo(BigDecimal.ZERO) > 0) {
+            if (ObjectUtil.isNotEmpty(sOrder.getDuration()) && sOrder.getDuration().compareTo(BigDecimal.ZERO) > 0 && ObjectUtil.isEmpty(sOrder.getMonthlyCardId())) {
                 DurationLog durationLog = new DurationLog();
                 durationLog.setConsumerId(sOrder.getConsumerId());
                 durationLog.setVariableDuration(sOrder.getDuration());
@@ -1574,6 +1573,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 
     private void refundExtracted(ConsumerMonthlyCard consumerMonthlyCard, SOrder sOrder, ConsumerSecondaryCard consumerSecondaryCard) {
         if (!ObjectUtils.isEmpty(sOrder.getMonthlyCardId()) && !ObjectUtils.isEmpty(sOrder.getDuration())) {
+            //判断订单的下单时间是否是当前天
+            LocalDate localDate1 = sOrder.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+            LocalDate localDate2 = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+            if (localDate1.equals(localDate2)) {
                 consumerMonthlyCard.setFreeDuration(consumerMonthlyCard.getFreeDuration().add(sOrder.getDuration()));
                 MonthlyCardLog monthlyCardLog = new MonthlyCardLog();
                 monthlyCardLog.setConsumerMonthlyCardId(sOrder.getMonthlyCardId());
@@ -1586,7 +1589,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 monthlyCardLog.setCreateTime(new Date());
                 consumerMonthlyCardService.updateById(consumerMonthlyCard);
                 monthlyCardLogService.save(monthlyCardLog);
-
+            }
         }
         if (!ObjectUtils.isEmpty(sOrder.getSecondaryCardId())) {
             consumerSecondaryCard.setNumber(consumerSecondaryCard.getNumber() + 1);
@@ -2190,9 +2193,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             }
             if (!ObjectUtils.isEmpty(sOrder.getMonthlyCardId()) || !ObjectUtils.isEmpty(sOrder.getSecondaryCardId())) {
                 creatExtracted(consumerMonthlyCard, sOrder, consumerSecondaryCard);
-            } else {
-                creatExtracted(consumerWallet, sOrder, consumerMember);
             }
+            creatExtracted(consumerWallet, sOrder, consumerMember);
             baseMapper.updateSOrder(sOrder);
             unLockOrder(sOrder.getRoomId());
             if (sOrder.getOrderType().equals(OrderTypeEnum.RENEW.getCode())) {
@@ -2348,9 +2350,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     }
                     if (!ObjectUtils.isEmpty(sOrder.getMonthlyCardId()) || !ObjectUtils.isEmpty(sOrder.getSecondaryCardId())) {
                         refundExtracted(consumerMonthlyCard, sOrder, consumerSecondaryCard);
-                    } else {
-                        refundExtracted(consumerWallet, sOrder, consumerMember);
                     }
+                        refundExtracted(consumerWallet, sOrder, consumerMember);
+
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -2379,9 +2381,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 updateById(sOrder);
                 if (!ObjectUtils.isEmpty(sOrder.getMonthlyCardId()) || !ObjectUtils.isEmpty(sOrder.getSecondaryCardId())) {
                     refundExtracted(consumerMonthlyCard, sOrder, consumerSecondaryCard);
-                } else {
-                    refundExtracted(consumerWallet, sOrder, consumerMember);
                 }
+                    refundExtracted(consumerWallet, sOrder, consumerMember);
                 //微信退款
 //                if (sOrder.getPayType().equals(PayTypeEnum.WECHAT.getCode()) && request.getAmount().compareTo(BigDecimal.ZERO) == 0) {
                     // 退款task， 定时任务退优惠券
@@ -2720,7 +2721,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 request.setBuyType(BuyTypeEnum.TIME.getCode());
                 if (ObjectUtil.isNotEmpty(consumerMember)) {
                     if (ObjectUtil.isNotEmpty(consumerMonthlyCard)) {
-                        totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room, consumerMember);
+                        totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room, consumerMember, consumerWallet);
                     } else if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
                         totalFee = getBigDecimal(consumerSecondaryCard, priceResponse, payPrice, timeLong, room);
                     } else {
@@ -2744,7 +2745,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     priceResponse.setTotalFeeNow(payPrice);
                     request.setBuyType(BuyTypeEnum.PACK.getCode());
                     if (ObjectUtil.isNotEmpty(consumerMember)) {
-                        if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
+                        if (ObjectUtil.isNotEmpty(consumerMonthlyCard)) {
+                            totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room, consumerMember, consumerWallet);
+                        } else if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
                             totalFee = getBigDecimal(consumerSecondaryCard, priceResponse, byId, payPrice);
                         } else {
                             queryWrapper.eq(Activity::getLabelId, roomLabel.getLabelId());
@@ -2771,7 +2774,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     request.setBuyType(BuyTypeEnum.TIME.getCode());
                     if (ObjectUtil.isNotEmpty(consumerMember)) {
                         if (ObjectUtil.isNotEmpty(consumerMonthlyCard)) {
-                            totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room, consumerMember);
+                            totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room, consumerMember, consumerWallet);
                         } else if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
                             totalFee = getBigDecimal(consumerSecondaryCard, priceResponse, payPrice, timeLong, room);
                         } else {
@@ -2796,7 +2799,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             priceResponse.setTotalFeeNow(payPrice);
             request.setBuyType(BuyTypeEnum.PACK.getCode());
             if (ObjectUtil.isNotEmpty(consumerMember)) {
-                if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
+                if (ObjectUtil.isNotEmpty(consumerMonthlyCard)) {
+                    totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room, consumerMember, consumerWallet);
+                } else if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
                     totalFee = getBigDecimal(consumerSecondaryCard, priceResponse, byId, payPrice);
                 } else {
                     queryWrapper.eq(Activity::getPackId, request.getPackId());
@@ -3142,7 +3147,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     }
 
     private BigDecimal getBigDecimal(ConsumerMonthlyCard consumerMonthlyCard, BigDecimal timeLong,
-                                     ComputedOrderPriceResponse priceResponse, BigDecimal totalFee, SRoom room, ConsumerMember consumerMember) {
+                                     ComputedOrderPriceResponse priceResponse, BigDecimal totalFee, SRoom room, ConsumerMember consumerMember, ConsumerWallet consumerWallet) {
         MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>().eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel()));
         priceResponse.setDiscountRatio(memberConfig.getDiscountRatio());
         priceResponse.setDiscount(memberConfig.getDiscountRatio());
@@ -3153,7 +3158,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             priceResponse.setDiscount(BigDecimal.ZERO);
             totalFee = new BigDecimal(0);
             priceResponse.setMemberDiscount(new BigDecimal(0.00));
-            priceResponse.setTotalFeeNow(priceResponse.getTotalFee());
+//            priceResponse.setTotalFeeNow(priceResponse.getTotalFee());
             priceResponse.setPayFee(BigDecimal.ZERO);
             priceResponse.setMonthlyCardId(consumerMonthlyCard.getId());
         } else if (consumerMonthlyCard.getFreeDuration().compareTo(timeLong) < 0) {
@@ -3169,6 +3174,15 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             priceResponse.setMonthlyCardId(consumerMonthlyCard.getId());
             priceResponse.setMemberDiscount(remainingBalance.subtract(totalFee));
         }
+        if (consumerWallet.getBalance().compareTo(priceResponse.getTotalFeeNow()) >= 0) {
+            priceResponse.setBalance(priceResponse.getTotalFeeNow());
+            priceResponse.setRemainingBalance(consumerWallet.getBalance().subtract(priceResponse.getTotalFeeNow()));
+            totalFee = new BigDecimal(0);
+        } else if (consumerWallet.getBalance().compareTo(priceResponse.getTotalFeeNow()) < 0) {
+            priceResponse.setBalance(consumerWallet.getBalance());
+            priceResponse.setRemainingBalance(new BigDecimal(0));
+            totalFee = priceResponse.getTotalFeeNow().subtract(consumerWallet.getBalance());
+        }
         return totalFee;
     }
 
@@ -3177,7 +3191,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if (consumerSecondaryCard.getSingleDuration() >= Integer.valueOf(byId.getDuration()) && consumerSecondaryCard.getSingleAmount().compareTo(byId.getPrice()) >= 0) {
             priceResponse.setDiscount(BigDecimal.ZERO);
             priceResponse.setMemberDiscount(BigDecimal.ZERO);
-            priceResponse.setTotalFeeNow(BigDecimal.ZERO);
+//            priceResponse.setTotalFeeNow(BigDecimal.ZERO);
             priceResponse.setPayFee(BigDecimal.ZERO);
             priceResponse.setSecondaryCardId(consumerSecondaryCard.getId());
             payPrice = BigDecimal.ZERO;
@@ -3191,7 +3205,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if (bigDecimal.compareTo(timeLong) == 0 && consumerSecondaryCard.getSingleAmount().compareTo(timeLong.multiply(room.getPrice())) >= 0) {
             priceResponse.setDiscount(BigDecimal.ZERO);
             priceResponse.setMemberDiscount(BigDecimal.ZERO);
-            priceResponse.setTotalFeeNow(BigDecimal.ZERO);
+            priceResponse.setTotalFeeNow(payPrice);
             priceResponse.setPayFee(BigDecimal.ZERO);
             priceResponse.setSecondaryCardId(consumerSecondaryCard.getId());
             payPrice = BigDecimal.ZERO;