记得上下班打卡 | git大法好,push需谨慎

Commit 46003f2b authored by 张国柄's avatar 张国柄

fix:会员订单列表排序;

fix:会员续费updated_at;
parent 90e7e870
...@@ -29,10 +29,7 @@ import org.springframework.util.StringUtils; ...@@ -29,10 +29,7 @@ import org.springframework.util.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Slf4j @Slf4j
...@@ -262,6 +259,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -262,6 +259,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
updateExistUserMemberVo.setState(1); updateExistUserMemberVo.setState(1);
updateExistUserMemberVo.setExpiryAt(expiryAt); updateExistUserMemberVo.setExpiryAt(expiryAt);
updateExistUserMemberVo.setUpdatedAt(now);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), updateExistUserMemberVo); adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), updateExistUserMemberVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
...@@ -471,6 +469,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -471,6 +469,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
(expiryAt.isBefore(now) ? now : expiryAt).plusDays(initMemberOrderVo.getDays()) (expiryAt.isBefore(now) ? now : expiryAt).plusDays(initMemberOrderVo.getDays())
.withHour(23).withMinute(59).withSecond(59) .withHour(23).withMinute(59).withSecond(59)
); );
updateExistUserMemberVo.setUpdatedAt(now);
toMqSqls.add(SqlMapping.get("adam_user_member.update")); toMqSqls.add(SqlMapping.get("adam_user_member.update"));
upsertUserMemberObjs.add(new Object[]{ upsertUserMemberObjs.add(new Object[]{
updateExistUserMemberVo.getState(), updateExistUserMemberVo.getExpiryAt(), now, updateExistUserMemberVo.getUid() updateExistUserMemberVo.getState(), updateExistUserMemberVo.getExpiryAt(), now, updateExistUserMemberVo.getUid()
...@@ -567,7 +566,9 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -567,7 +566,9 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
orderVos.forEach(r -> vos.add(AdamMemberOrderSimpleVo.getNew().copy(r))); orderVos.forEach(r -> vos.add(AdamMemberOrderSimpleVo.getNew().copy(r)));
pagedResult.setTotal(orderVos.size(), 20); vos.sort(Comparator.comparing(AdamMemberOrderSimpleVo::getCreatedAt).reversed());
pagedResult.setTotal(orderVos.size(), 40);
pagedResult.setList(vos); pagedResult.setList(vos);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment