fix

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, Integer orderType) {
+	public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId, Long acId, String nickname, String register, Boolean isGoogle, Boolean isSubsidy, Boolean isRenewPackage, Integer otherOrderType) {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (channelId != null) {
 			List<Long> popularizeIds = channelPopularizeMapper.getPopularizeIdByChannelId(channelId);
@@ -184,13 +184,12 @@ public class CmsOrderController {
 			}
 			conditionSql += " exists (select 1 from order_don_renew_record odrr1 where odrr1.order_id = o.id limit 1)";
 		}
-		if (orderType != null) {
+		if (otherOrderType != null) {
 			//3.续费升级订单
-			if (orderType == 3) {
+			if (otherOrderType == 3) {
 				builder.put("tb", String.format(" inner join order_don_renew_record odcr on odcr.order_id = o.id and odcr.order_type = 2"));
-			}
-			//4.用户权益订单
-			if (orderType == 4) {
+			} else if (otherOrderType == 4) {
+				//4.用户权益订单
 				builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
 			}
 		}
@@ -314,7 +313,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, Integer orderType) 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 otherOrderType) throws InterruptedException {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (channelId != null) {
 			List<Long> popularizeIds = channelPopularizeMapper.getPopularizeIdByChannelId(channelId);
@@ -332,13 +331,13 @@ public class CmsOrderController {
 		if (StrUtil.isNotBlank(showId)) {
 			builder.field(ExcelOrderDonData::getUserId, userService.getUserIdByShowId(showId));
 		}
-		if (orderType != null) {
+		if (otherOrderType != null) {
 			//3.续费升级订单
-			if (orderType == 3) {
+			if (otherOrderType == 3) {
 				builder.put("tb", String.format(" inner join order_don_renew_record odcr on odcr.order_id = o.id and odcr.order_type = 2"));
 			}
 			//4.用户权益订单
-			if (orderType == 4) {
+			if (otherOrderType == 4) {
 				builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
 			}
 		}