|
@@ -322,7 +322,12 @@ public class CmsGroupRelationController {
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/get/recharge/operate/record")
|
|
@GetMapping("/get/recharge/operate/record")
|
|
|
public Result<List<GptUserRechargeNumRecord>> getGptUserRechargeNumRecord(Long relationId, Long userId) {
|
|
public Result<List<GptUserRechargeNumRecord>> getGptUserRechargeNumRecord(Long relationId, Long userId) {
|
|
|
- List<GptUserRechargeNumRecord> gptUserRechargeNumRecords = beanSearcher.searchAll(GptUserRechargeNumRecord.class, MapUtils.flatBuilder(request.getParameterMap()).field(GptUserRechargeNumRecord::getRelationId, relationId).field(GptUserRechargeNumRecord::getUserId, userId).build());
|
|
|
|
|
|
|
+ OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class).eq(OrderDon::getUserId, userId).eq(OrderDon::getRelationId, relationId).notIn(OrderDon::getStatus, Constant.noOrderAllStatus).orderByDesc(OrderDon::getId).last("limit 1"));
|
|
|
|
|
+ List<GptUserRechargeNumRecord> gptUserRechargeNumRecords = beanSearcher.searchAll(GptUserRechargeNumRecord.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
|
|
|
+ .field(GptUserRechargeNumRecord::getRelationId, relationId)
|
|
|
|
|
+ .field(GptUserRechargeNumRecord::getUserId, userId)
|
|
|
|
|
+ .field(GptUserRechargeNumRecord::getCreatedTime, orderDon.getCreatedTime()).op(Operator.GreaterThan)
|
|
|
|
|
+ .build());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(gptUserRechargeNumRecords);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(gptUserRechargeNumRecords);
|
|
|
}
|
|
}
|
|
|
|
|
|