Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java

@@ -61,7 +61,7 @@
            monthEnd = DateTimeHelper.getCurrentMouthEnd();
        }
        List<UserIntegralChanges> userIntegralChanges = this.baseMapper.selectList(new QueryWrapper<UserIntegralChanges>()
                .eq("appUserId", userIdFormRedis)
                .eq("appUserId", userIdFormRedis).le("type", 5)
                .between("insertTime", monthStart, monthEnd)
                .orderByDesc("insertTime"));
        if (userIntegralChanges.size() > 0) {
@@ -109,6 +109,16 @@
                        detail.setConsumeName("社区世界杯调整比分");
                        detail.setDetailsType(1);
                        break;
                    case 9:
                        detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
                        detail.setConsumeName("社区世界杯平场");
                        detail.setDetailsType(2);
                        break;
                    case 10:
                        detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
                        detail.setConsumeName("社区世界杯败场");
                        detail.setDetailsType(2);
                        break;
                    default:
                        break;
                }