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

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameBackPolicyServiceImpl.java

@@ -274,7 +274,8 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
     public IPage<GameBackPolicyVO> policyList(GameBackPolicyListDTO dto) {
         return gameBackPolicyService.page(dto.toPage(), new LambdaQueryWrapper<GameBackPolicy>()
                         .like(StringUtils.isNotBlank(dto.getBackPolicyName()), GameBackPolicy::getBackPolicyName, dto.getBackPolicyName())
-                        .eq(GameBackPolicy::getCreateBy,SecurityUtil.getUserId()))
+                        .eq(GameBackPolicy::getCreateBy,SecurityUtil.getUserId())
+                        .orderByDesc(GameBackPolicy::getCreateTime))
                 .convert(item -> GameBackPolicyVO.builder()
                         .id(item.getId())
                         .backPolicyName(item.getBackPolicyName())
@@ -283,10 +284,13 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                         .firstRechargeBackPercentage(item.getFirstRechargeBackPercentage())
                         .firstRechargeMoney(item.getFirstRechargeMoney())
                         .otherRechargeBackPercentage(item.getOtherRechargeBackPercentage())
+                        .levelDown(item.getLevelDown())
+                        .createTime(item.getCreateTime())
+                        .updateTime(item.getUpdateTime())
                         .createBy(item.getCreateBy())
                         .updateBy(item.getUpdateBy())
                         .createName(sysUserRpc.getById(item.getCreateBy()).getData().getNickname())
-                        .updateName(sysUserRpc.getById(item.getUpdateBy()).getData().getNickName())
+                        .updateName(null == item.getUpdateBy() ? null : sysUserRpc.getById(item.getUpdateBy()).getData().getNickName())
                         .build());
     }
 }