|
|
@@ -111,7 +111,7 @@ public class CmsOrderController {
|
|
|
|
|
|
@GetMapping("/get")
|
|
|
@SaCheckPermission("order:view")
|
|
|
- public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId, Long acId, String nickname, String register, Boolean isGoogle) {
|
|
|
+ public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId, Long acId, String nickname, String register, Boolean isGoogle, Boolean isSubsidy) {
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
if (channelId != null) {
|
|
|
List<Long> popularizeIds = channelPopularizeMapper.getPopularizeIdByChannelId(channelId);
|
|
|
@@ -155,6 +155,12 @@ public class CmsOrderController {
|
|
|
}
|
|
|
conditionSql += " limit 1)";
|
|
|
}
|
|
|
+ if (isSubsidy != null) {
|
|
|
+ if (StrUtil.isNotEmpty(conditionSql)) {
|
|
|
+ conditionSql += " and ";
|
|
|
+ }
|
|
|
+ conditionSql += " exists (select 1 from order_don_subsidy_relate ocr where ocr.order_id = o.id limit 1)";
|
|
|
+ }
|
|
|
if (StrUtil.isNotBlank(conditionSql)) {
|
|
|
builder.put("condition", conditionSql);
|
|
|
}
|