Commit 290dc8c6 authored by licc's avatar licc

接口调试代码提交

parent 88406dcc
...@@ -62,6 +62,6 @@ public interface TradeRecordMapper extends BaseMapper<TradeRecord> { ...@@ -62,6 +62,6 @@ public interface TradeRecordMapper extends BaseMapper<TradeRecord> {
* @param yearMonth 年月 * @param yearMonth 年月
* @return 交易列表 * @return 交易列表
*/ */
List<WithdrawalRecordVo> getWithdrawalRecord(@Param("userId") String userId, Date yearMonth); List<WithdrawalRecordVo> getWithdrawalRecord(@Param("userId") String userId, @Param("yearMonth") Date yearMonth);
} }
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</sql> </sql>
<sql id="cols_exclude_id"> <sql id="cols_exclude_id">
user_id,user_level,year_month,extract_money,earnings_month,frozen_money,earnings_total,create_time,update_time user_id,user_level,`year_month`,extract_money,earnings_month,frozen_money,earnings_total,create_time,update_time
</sql> </sql>
<sql id="vals"> <sql id="vals">
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<sql id="updateCondition"> <sql id="updateCondition">
<if test="userId != null">user_id = #{userId},</if> <if test="userId != null">user_id = #{userId},</if>
<if test="userLevel != null">user_level = #{userLevel},</if> <if test="userLevel != null">user_level = #{userLevel},</if>
<if test="yearMonth != null">year_month =#{yearMonth},</if> <if test="yearMonth != null">`year_month` =#{yearMonth},</if>
<if test="extractMoney != null">extract_money =#{extractMoney},</if> <if test="extractMoney != null">extract_money =#{extractMoney},</if>
<if test="earningsMonth != null">earnings_month =#{earningsMonth},</if> <if test="earningsMonth != null">earnings_month =#{earningsMonth},</if>
<if test="frozenMoney != null">frozen_money =#{frozenMoney},</if> <if test="frozenMoney != null">frozen_money =#{frozenMoney},</if>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<if test="id != null">id = #{id}</if> <if test="id != null">id = #{id}</if>
<if test="userId != null">and user_id = #{userId}</if> <if test="userId != null">and user_id = #{userId}</if>
<if test="userLevel != null">and user_level = #{userLevel}</if> <if test="userLevel != null">and user_level = #{userLevel}</if>
<if test="yearMonth != null">and year_month =#{yearMonth}</if> <if test="yearMonth != null">and `year_month` =#{yearMonth}</if>
<if test="extractMoney != null">and extract_money =#{extractMoney}</if> <if test="extractMoney != null">and extract_money =#{extractMoney}</if>
<if test="earningsMonth != null">and earnings_month =#{earningsMonth}</if> <if test="earningsMonth != null">and earnings_month =#{earningsMonth}</if>
<if test="frozenMoney != null">and frozen_money =#{frozenMoney}</if> <if test="frozenMoney != null">and frozen_money =#{frozenMoney}</if>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<include refid="table"/> <include refid="table"/>
<where> <where>
user_id=#{userId} user_id=#{userId}
and year_month=#{yearMonth} and `year_month`=#{yearMonth}
</where> </where>
</select> </select>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</resultMap> </resultMap>
<sql id="table"> <sql id="table">
last_month_account_info last_month_account
</sql> </sql>
<sql id="cols_all"> <sql id="cols_all">
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</sql> </sql>
<sql id="cols_exclude_id"> <sql id="cols_exclude_id">
user_id,user_level,year_month,extract_money,earnings_month,frozen_money,earnings_total,create_time,update_time user_id,user_level,`year_month`,extract_money,earnings_month,frozen_money,earnings_total,create_time,update_time
</sql> </sql>
<sql id="vals"> <sql id="vals">
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<sql id="updateCondition"> <sql id="updateCondition">
<if test="userId != null">user_id = #{userId},</if> <if test="userId != null">user_id = #{userId},</if>
<if test="userLevel != null">user_level = #{userLevel},</if> <if test="userLevel != null">user_level = #{userLevel},</if>
<if test="yearMonth != null">year_month =#{yearMonth},</if> <if test="yearMonth != null">`year_month` =#{yearMonth},</if>
<if test="extractMoney != null">extract_money =#{extractMoney},</if> <if test="extractMoney != null">extract_money =#{extractMoney},</if>
<if test="earningsMonth != null">earnings_month =#{earningsMonth},</if> <if test="earningsMonth != null">earnings_month =#{earningsMonth},</if>
<if test="frozenMoney != null">frozen_money =#{frozenMoney},</if> <if test="frozenMoney != null">frozen_money =#{frozenMoney},</if>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<if test="id != null">id = #{id}</if> <if test="id != null">id = #{id}</if>
<if test="userId != null">and user_id = #{userId}</if> <if test="userId != null">and user_id = #{userId}</if>
<if test="userLevel != null">and user_level = #{userLevel}</if> <if test="userLevel != null">and user_level = #{userLevel}</if>
<if test="yearMonth != null">and year_month =#{yearMonth}</if> <if test="yearMonth != null">and `year_month` =#{yearMonth}</if>
<if test="extractMoney != null">and extract_money =#{extractMoney}</if> <if test="extractMoney != null">and extract_money =#{extractMoney}</if>
<if test="earningsMonth != null">and earnings_month =#{earningsMonth}</if> <if test="earningsMonth != null">and earnings_month =#{earningsMonth}</if>
<if test="frozenMoney != null">and frozen_money =#{frozenMoney}</if> <if test="frozenMoney != null">and frozen_money =#{frozenMoney}</if>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<include refid="table"/> <include refid="table"/>
<where> <where>
user_id=#{userId} user_id=#{userId}
and year_month=#{yearMonth} and `year_month`=#{yearMonth}
</where> </where>
</select> </select>
......
...@@ -101,8 +101,8 @@ ...@@ -101,8 +101,8 @@
</if> </if>
<if test="yearMonth != null"> <if test="yearMonth != null">
AND( AND(
YEAR(year_month) = YEAR(#{yearMonth}) YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(year_month) = MONTH(#{yearMonth})) AND MONTH(create_time) = MONTH(#{yearMonth}))
</if> </if>
</where> </where>
</select> </select>
...@@ -115,6 +115,7 @@ ...@@ -115,6 +115,7 @@
WHERE date_format(create_time,'%Y-%m') &lt; date_format(now(),'%Y-%m') WHERE date_format(create_time,'%Y-%m') &lt; date_format(now(),'%Y-%m')
and date_format(create_time,'%Y-%m') >= date_format(now() - interval 7 month,'%Y-%m') and date_format(create_time,'%Y-%m') >= date_format(now() - interval 7 month,'%Y-%m')
and (status=1 or status=3) and (status=1 or status=3)
and user_id=#{userId}
group by user_id ,create_time desc; group by user_id ,create_time desc;
</select> </select>
......
...@@ -105,7 +105,7 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple ...@@ -105,7 +105,7 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
} }
//1、获取用户信息 //1、获取用户信息
User user = usersMapper.selectById(userId); User user = usersMapper.getByUserId(userId);
if (null == user) { if (null == user) {
return R.error("用户信息不存在!"); return R.error("用户信息不存在!");
} }
......
...@@ -134,11 +134,8 @@ public class UserController extends BaseController { ...@@ -134,11 +134,8 @@ public class UserController extends BaseController {
@ApiOperation(value = "查询空投池信息", notes = "查询空投池信息", httpMethod = "GET") @ApiOperation(value = "查询空投池信息", notes = "查询空投池信息", httpMethod = "GET")
@GetMapping("/queryAerialDelivery") @GetMapping("/queryAerialDelivery")
public R<AerialDeliveryVo> queryAerialDelivery(String userId, String yearMonth) { public R<AerialDeliveryVo> queryAerialDelivery() {
log.info("shop-mall[]UserController[]getWithdrawalRecord[]input.param.userId:{},yearMonth:" + userId, yearMonth); log.info("shop-mall[]UserController[]queryAerialDelivery[]input.method" );
if (StringUtils.isBlank(yearMonth)) {
return R.error("入参不能为空!");
}
return userService.queryAerialDelivery(); return userService.queryAerialDelivery();
} }
......
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