Merge branch 'refs/heads/dev' into test

share-admin/src/main/resources/logback.xml

@@ -27,7 +27,7 @@
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
-            <level>INFO</level>
+            <level>DEBUG</level>
             <!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
             <!-- 不匹配时的操作：拒绝（不记录） -->

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

@@ -194,7 +194,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
         logger.debug("修改会员用户");
         BigDecimal balance = consumerWallet.getBalance().add(recharge.getRechargeAmount());
         if (rechargeConf.getGiveType().contains(GiveTypeEnum.AMOUNT.getIndex())) {
-            balance.add(rechargeConf.getGiveAmount());
+            balance = balance.add(rechargeConf.getGiveAmount());
             consumerWallet.setBalance(balance);
         } else {
             consumerWallet.setBalance(balance);

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

@@ -362,7 +362,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         HashMap<String, Object> summedPrice = baseMapper.sumPrice(sOrder);
         List<Long> ids = sOrderVos.stream().map(SOrderVo::getCouponId).collect(Collectors.toList());
         Map<Long, SConsumerCoupon> couponMap = new HashMap<>();
-        SConsumerCoupon sConsumerCoupon = new SConsumerCoupon();
+        SConsumerCoupon sConsumerCoupon = null;
         if (CollectionUtils.isNotEmpty(ids)) {
             couponMap = consumerCouponService.listByIds(ids)
                     .stream().collect(Collectors.toMap(SConsumerCoupon::getId, s -> s));
@@ -401,7 +401,11 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             tableDataInfo.setTotalRealRefundAmount(BigDecimal.ZERO);
         }
 
-        tableDataInfo.setTotalSalesAmount(ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice()) ? sConsumerCoupon.getCouponPayPrice() : BigDecimal.ZERO);
+        if (ObjectUtil.isNotEmpty(sConsumerCoupon)) {
+            tableDataInfo.setTotalSalesAmount(sConsumerCoupon.getCouponPayPrice());
+        } else {
+            tableDataInfo.setTotalSalesAmount(BigDecimal.ZERO);
+        }
 
         return tableDataInfo;
 
@@ -1828,12 +1832,15 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         queryWrapper.eq(SOrder::getIsDelete, YesNoEnum.no.getIndex());
         queryWrapper.eq(SOrder::getStoreId, sOrder.getStoreId());
         queryWrapper.eq(SOrder::getRoomId, sOrder.getRoomId());
-        queryWrapper.apply("(IFNULL(start_date,pre_start_date) BETWEEN '"
+        String sql = "IFNULL(start_date,pre_start_date) BETWEEN '"
                 + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, sOrder.getPreStartDate())
-                + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(sOrder.getPreEndDate(), Constants.ROOM_LOCK_DELAY_MINUTE)) + "' " +
-                "OR IFNULL(end_date,pre_end_date) BETWEEN '"
-                + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(sOrder.getPreStartDate(), -Constants.ROOM_LOCK_DELAY_MINUTE))
-                + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, sOrder.getPreEndDate()) + "' )");
+                + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(sOrder.getPreEndDate(), Constants.ROOM_LOCK_DELAY_MINUTE)) + "' ";
+        if(sOrder.getOrderType().compareTo(OrderTypeEnum.RENEW.getCode())!=0) {
+            sql += "OR IFNULL(end_date,pre_end_date) BETWEEN '"
+                    + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(sOrder.getPreStartDate(), -Constants.ROOM_LOCK_DELAY_MINUTE))
+                    + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, sOrder.getPreEndDate()) + "'";
+        }
+        queryWrapper.apply("("+ sql +")");
         SOrder order = getOne(queryWrapper);
         if (ObjectUtil.isNotEmpty(order)) {
             baseMapper.updateSOrder(sOrder);