feat : 调试修改

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/UserOrderListVO.java

@@ -22,11 +22,17 @@ public class UserOrderListVO {
     @ApiModelProperty(notes = "用户id")
     private String userId;
 
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(notes = "主键id")
+    private String id;
+
     /**
      * 商户订单号
      */
     @ApiModelProperty(notes = "商户订单号")
-    private String id;
+    private String orderId;
 
     /**
      * 游戏商品名称

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/OrderServiceImpl.java

@@ -151,6 +151,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             return null;
         }
         UserOrderListVO orderListVO = BeanUtils.copy(order, UserOrderListVO.class);
+        orderListVO.setId(order.getOrderId());
         //查询角色名称
         GameUserRoleDTO gameUserRoleDTO = gameUserRoleService.getByRoleId(order.getRoleId());
         if (gameUserRoleDTO != null) {

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/UserServiceImpl.java

@@ -207,19 +207,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             super.update(new LambdaUpdateWrapper<User>()
                     .eq(User::getId, param.getUserId())
                     .eq(User::getUsername, param.getUsername())
-                    .set(Strings.isNotBlank(param.getMobile()), User::getMobile, param.getMobile())
+                    .set(Strings.isNotBlank(param.getMobile()) && !param.getMobile().contains("*"), User::getMobile, param.getMobile())
                     .set(Strings.isNotBlank(param.getAliPay()), User::getAliPay, param.getAliPay())
                     .set(Strings.isNotBlank(param.getPassword()), User::getPassword, this.cmfPassword(param.getPassword()))
                     .set(User::getUpdateTime, LocalDateTime.now()));
         }
-        //用户拓展信息更新
-//        if (Strings.isNotBlank(param.getRealName()) || Strings.isNotBlank(param.getIdCard())) {
-//            userExtService.update(new LambdaUpdateWrapper<UserExt>()
-//                    .eq(UserExt::getUserId, param.getUserId())
-//                    .set(Strings.isNotBlank(param.getRealName()), UserExt::getRealName, param.getRealName())
-//                    .set(Strings.isNotBlank(param.getIdCard()), UserExt::getIdCard, param.getIdCard())
-//                    .set(UserExt::getUpdateTime, LocalDateTime.now()));
-//        }
         return Boolean.TRUE;
     }
 

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/OrderServiceImpl.java

@@ -116,7 +116,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 .productName(payParam.getProductName())
                 .gamePaywayId(gamePayWay.getId())
                 .ext(payParam.getExtension())
-                .isFirstRecharge(count <= 0 ? 0 : 1)
+                .isFirstRecharge(count > 0 ? 0 : 1)
                 .payDevice(payParam.getPayDevice())
                 .createTime(LocalDateTime.now())
                 .updateTime(LocalDateTime.now())