|
@@ -114,8 +114,7 @@ public class RechargeRecordApiController {
|
|
|
Condition condition = new Condition(RechargeRecord.class);
|
|
|
Criteria criteria = condition.createCriteria();
|
|
|
criteria.andEqualTo("status", 1);
|
|
|
- criteria.andEqualTo("userId", 3);
|
|
|
- // criteria.andEqualTo("userId", authService.getTokenUserId(request));
|
|
|
+ criteria.andEqualTo("userId", authService.getTokenUserId(request));
|
|
|
condition.setOrderByClause("create_time desc");
|
|
|
List<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
|
|
|
if (CollectionUtil.isEmpty(list)) {
|
|
@@ -138,7 +137,7 @@ public class RechargeRecordApiController {
|
|
|
/**
|
|
|
* 充值订单二次三方支付
|
|
|
*/
|
|
|
- @GetMapping("thirdPayAgree/{recordId:^\\d+$}")
|
|
|
+ @GetMapping("thirdPayAgree/{paymentId:^\\d+$}")
|
|
|
public Result thirdPayAgree(@PathVariable("paymentId") Long paymentId, HttpServletRequest request) {
|
|
|
Condition condition = new Condition(RechargeRecord.class);
|
|
|
Criteria criteria = condition.createCriteria();
|