修改累计消费进行积分

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

@@ -313,17 +313,20 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
         List<Long> ids = orderList.stream().map(SOrder::getCouponId).filter(Objects::nonNull).collect(Collectors.toList());
         if (CollectionUtil.isEmpty(ids)) {
             logger.debug("优惠券为空");
-            return;
-        }
-        List<SConsumerCoupon> consumerCouponList = consumerCouponService.selectByIds(ids).stream()
-                .filter(s -> s.getCouponType().equals(CouponTypeEnum.CASH.getCode())).collect(Collectors.toList());
-        consumerCouponList.stream().forEach(item -> {
-            if (ObjectUtil.isNotEmpty(item.getCouponPayPrice())) {
-                consumption[0] = consumption[0].add(item.getCouponPayPrice());
-            } else {
-                consumption[0] = consumption[0].add(sCouponMap.get(item.getCouponId()).getCouponPayPrice());
+            if (one.getMemberType().equals(MemberTypeEnum.RECHARGE.getIndex())) {
+                return;
             }
-        });
+        } else {
+            List<SConsumerCoupon> consumerCouponList = consumerCouponService.selectByIds(ids).stream()
+                    .filter(s -> s.getCouponType().equals(CouponTypeEnum.CASH.getCode())).collect(Collectors.toList());
+            consumerCouponList.stream().forEach(item -> {
+                if (ObjectUtil.isNotEmpty(item.getCouponPayPrice())) {
+                    consumption[0] = consumption[0].add(item.getCouponPayPrice());
+                } else {
+                    consumption[0] = consumption[0].add(sCouponMap.get(item.getCouponId()).getCouponPayPrice());
+                }
+            });
+        }
         logger.debug("优惠券购买金额:" + consumption[0]);
         if (one.getMemberType().equals(MemberTypeEnum.RIGHTS.getIndex())) {
             //orderList累加payPrice