|
@@ -19,10 +19,7 @@ import com.cyksj.config.zfb.ZfbProductCode;
|
|
|
import com.cyksj.dto.Result;
|
|
import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.GatewayApiCode;
|
|
import com.cyksj.enums.GatewayApiCode;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
-import com.cyksj.mapper.GoodsDonSkuMapper;
|
|
|
|
|
-import com.cyksj.mapper.OrderDonRenewRecordMapper;
|
|
|
|
|
-import com.cyksj.mapper.OrderDonWaybillMapper;
|
|
|
|
|
-import com.cyksj.mapper.UserMapper;
|
|
|
|
|
|
|
+import com.cyksj.mapper.*;
|
|
|
import com.cyksj.mapper.channel.UserPayEquipmentAvailableBenefitsMapper;
|
|
import com.cyksj.mapper.channel.UserPayEquipmentAvailableBenefitsMapper;
|
|
|
import com.cyksj.mapper.market.task.UserBindDetailMapper;
|
|
import com.cyksj.mapper.market.task.UserBindDetailMapper;
|
|
|
import com.cyksj.model.dto.AliPayParams;
|
|
import com.cyksj.model.dto.AliPayParams;
|
|
@@ -883,4 +880,23 @@ public class OrderController {
|
|
|
}
|
|
}
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 用户续费订单列表
|
|
|
|
|
+ */
|
|
|
|
|
+ @GetMapping("/get/renew/order")
|
|
|
|
|
+ public Result<List<OrderDonView>> getRenewOrder(Long relationId) {
|
|
|
|
|
+ long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
|
|
+ MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
|
|
+ if (relationId != null) {
|
|
|
|
|
+ builder.field(OrderDonView::getRelationId, relationId);
|
|
|
|
|
+ }
|
|
|
|
|
+ List<Long> userIds = UserBindRelationService.getRelationUserIdList(userId, null);
|
|
|
|
|
+ List<OrderDonView> list = beanSearcher.searchAll(OrderDonView.class, builder
|
|
|
|
|
+ .field(OrderDonView::getUserId, userIds).op(Operator.InList)
|
|
|
|
|
+ .field(OrderDonView::getOrderType, 2)
|
|
|
|
|
+ .orderBy(OrderDonView::getId).desc()
|
|
|
|
|
+ .build());
|
|
|
|
|
+ return GatewayResponse.SUCCESS.newBuilder().toResult(list);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|