Compare commits
No commits in common. "9f40061534e94f005797762d6108d5be5c07b35f" and "fe7bca71eeaad975371f687eef439b4a3a5db140" have entirely different histories.
9f40061534
...
fe7bca71ee
|
|
@ -11,7 +11,6 @@ import com.alipay.api.DefaultAlipayClient;
|
|||
import com.alipay.api.domain.AlipayTradeCreateModel;
|
||||
import com.alipay.api.request.AlipayTradeCreateRequest;
|
||||
import com.alipay.api.response.AlipayTradeCreateResponse;
|
||||
import com.ruoyi.app.domain.AppOrder;
|
||||
import com.ruoyi.app.domain.dto.PayConfig;
|
||||
import com.ruoyi.app.domain.vo.AppUserInfoVo;
|
||||
import com.ruoyi.app.domain.vo.AppUserVo;
|
||||
|
|
@ -60,11 +59,7 @@ public class AppUserController extends BaseController
|
|||
{
|
||||
startPage();
|
||||
List<AppUserVo> list = appUserService.selectAppUserList(appUser);
|
||||
Integer count = appUserService.selectAppuserCount();
|
||||
TableDataInfo dataTable = getDataTable(list);
|
||||
dataTable.setTotal(count);
|
||||
|
||||
return dataTable;
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@GetMapping("/statistics")
|
||||
|
|
|
|||
|
|
@ -75,6 +75,4 @@ public interface AppUserMapper
|
|||
AppUser selectAppUserByEmail(String email);
|
||||
|
||||
int vipById(@Param("id")Long id);
|
||||
|
||||
Integer selectAppuserCount();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,4 @@ public interface IAppUserService
|
|||
AppUser selectAppUserByEmail(String email);
|
||||
|
||||
int vipById(Long id);
|
||||
|
||||
Integer selectAppuserCount();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -359,10 +359,4 @@ public class AppUserServiceImpl implements IAppUserService {
|
|||
public int vipById(Long id) {
|
||||
return appUserMapper.vipById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer selectAppuserCount() {
|
||||
|
||||
return appUserMapper.selectAppuserCount();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -436,8 +436,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<update id="vipById">
|
||||
</update>
|
||||
|
||||
<select id="selectAppuserCount" resultType="java.lang.Integer">
|
||||
select count(*) from app_user
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue