fix 订单类型

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelOrderDonData.java

@@ -21,7 +21,8 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "order_don o left join goods_don g on g.id = o.goods_id" +
-		" left join goods_don_sku sku on sku.id = o.sku_id",
+		" left join goods_don_sku sku on sku.id = o.sku_id" +
+		" :tb:",
 		where = ":condition:"
 )
 public class ExcelOrderDonData {

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonBackView.java

@@ -25,7 +25,8 @@ import java.util.List;
 @Setter
 @SearchBean(tables = "order_don o left join goods_don g on g.id = o.goods_id" +
 		" left join order_don_transport odt on odt.order_id = o.id" +
-		" left join goods_don_sku sku on sku.id = o.sku_id",
+		" left join goods_don_sku sku on sku.id = o.sku_id" +
+		" :tb:",
 		where = ":condition:"
 )
 public class OrderDonBackView {

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -128,7 +128,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, Boolean isSubsidy, Boolean isRenewPackage) {
+	public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId, Long acId, String nickname, String register, Boolean isGoogle, Boolean isSubsidy, Boolean isRenewPackage, Integer orderType) {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (channelId != null) {
 			List<Long> popularizeIds = channelPopularizeMapper.getPopularizeIdByChannelId(channelId);
@@ -184,6 +184,16 @@ public class CmsOrderController {
 			}
 			conditionSql += " exists (select 1 from order_don_renew_record odrr1 where odrr1.order_id = o.id limit 1)";
 		}
+		if (orderType != null) {
+			//3.续费升级订单
+			if (orderType == 3) {
+				builder.put("tb", String.format(" inner join order_don_renew_record odcr on odcr.order_id = o.id and ocdr.order_type = 2"));
+			}
+			//4.用户权益订单
+			if (orderType == 4) {
+				builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
+			}
+		}
 		if (StrUtil.isNotBlank(conditionSql)) {
 			builder.put("condition", conditionSql);
 		}
@@ -304,7 +314,7 @@ public class CmsOrderController {
 	@GetMapping("/export")
 	@SaCheckPermission("order:export")
 	@Log(module = "订单管理/导出订单", businessType = BusinessType.EXPORT, isSaveRequestData = true)
-	public void exportOrders(HttpServletResponse response, Long channelId, String account, String showId, Long acId, String nickname, String register, Boolean isGoogle, Boolean isSubsidy, Boolean isRenewPackage) throws InterruptedException {
+	public void exportOrders(HttpServletResponse response, Long channelId, String account, String showId, Long acId, String nickname, String register, Boolean isGoogle, Boolean isSubsidy, Boolean isRenewPackage, Integer orderType) throws InterruptedException {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (channelId != null) {
 			List<Long> popularizeIds = channelPopularizeMapper.getPopularizeIdByChannelId(channelId);
@@ -322,6 +332,16 @@ public class CmsOrderController {
 		if (StrUtil.isNotBlank(showId)) {
 			builder.field(ExcelOrderDonData::getUserId, userService.getUserIdByShowId(showId));
 		}
+		if (orderType != null) {
+			//3.续费升级订单
+			if (orderType == 3) {
+				builder.put("tb", String.format(" inner join order_don_renew_record odcr on odcr.order_id = o.id and ocdr.order_type = 2"));
+			}
+			//4.用户权益订单
+			if (orderType == 4) {
+				builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
+			}
+		}
 		String conditionSql = StrUtil.EMPTY;
 		if (acId != null) {
 			conditionSql += String.format(" o.user_id in (select user_id from corp_user where ac_id = %s)", acId);