发票订单列表返回

netflix-dao/src/main/java/com/cyksj/model/entity/ShopConfig.java

@@ -95,4 +95,9 @@ public class ShopConfig extends BaseEntity{
     @DbIgnore
     @TableField(exist = false)
     private Boolean dayLimitStatus;
+
+    /**
+     * 是否可开发票 默认false
+     */
+    private Boolean isInvoice;
 }

netflix-service/src/main/java/com/cyksj/service/invoice/impl/UserInvoiceApplyRecordServiceImpl.java

@@ -144,6 +144,10 @@ public class UserInvoiceApplyRecordServiceImpl implements UserInvoiceApplyRecord
 			if (shopConfig == null) {
 				throw BusinessRuntimeException.getInstance("申请发票错误，请联系客服处理");
 			}
+			if (!shopConfig.getIsInvoice()) {
+				throw BusinessRuntimeException.getInstance("存在不可开发票的订单信息，请刷新页面后重新选择");
+			}
+
 			invoiceApplyRecord.setZfbPayment(shopConfig.getPayment());
 			invoiceApplyRecord.setEmail(email);
 			userInvoiceApplyRecordMapper.insert(invoiceApplyRecord);

netflix-web/src/main/java/com/cyksj/web/controller/invoice/UserInvoiceFrontController.java

@@ -9,10 +9,9 @@ import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.OrderDonMapper;
 import com.cyksj.mapper.UpgradeOrderDonMapper;
+import com.cyksj.mapper.channel.ShopConfigMapper;
 import com.cyksj.mapper.vip.VipOrderDonMapper;
-import com.cyksj.model.entity.OrderDon;
-import com.cyksj.model.entity.UpgradeOrderDon;
-import com.cyksj.model.entity.VipOrderDon;
+import com.cyksj.model.entity.*;
 import com.cyksj.model.request.UserInvoiceOrderReq;
 import com.cyksj.model.views.UserInvoiceChoseOrderViews;
 import com.cyksj.model.views.UserInvoiceFrontView;
@@ -60,6 +59,8 @@ public class UserInvoiceFrontController {
 
 	private final OrderDonMapper orderDonMapper;
 
+	private final ShopConfigMapper shopConfigMapper;
+
 	/**
 	 * 发票 用户可选AI车票订单
 	 */
@@ -77,16 +78,15 @@ public class UserInvoiceFrontController {
 			dateCondition = String.format(" and o.created_time >= '%s'", DateUtil.offsetMonth(DateUtil.beginOfYear(now), -12));
 		}
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
-		//过滤appid 品如
-		List<String> appIds = Lists.newArrayList("2021003159660212");
-		//1月底后 过滤木棉订单
-		if (now.isAfter(DateUtil.parse("2025-02-01"))) {
-			appIds.add("2021003171697073");
+		//可分发票 商户ids
+		List<String> invoiceShpIds = shopConfigMapper.selectList(Wrappers.lambdaQuery(ShopConfig.class).eq(ShopConfig::getIsInvoice, Boolean.TRUE)).stream().map(ShopConfig::getAppId).collect(Collectors.toList());
+		if (CollUtil.isEmpty(invoiceShpIds)) {
+			return GatewayResponse.SUCCESS.newBuilder().toResult();
 		}
 		Integer orderCount = orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class)
 				.in(OrderDon::getUserId, userIdList)
 				.notIn(OrderDon::getStatus, Constant.noOrderAllStatus));
-		builder.field(UserInvoiceChoseOrderViews::getShopId, appIds).op(Operator.NotIn)
+		builder.field(UserInvoiceChoseOrderViews::getShopId, invoiceShpIds).op(Operator.InList)
 				.put("dc", dateCondition)
 				.field(UserInvoiceChoseOrderViews::getUserId, userIdList).op(Operator.InList);
 		List<UserInvoiceChoseOrderViews> list = new ArrayList<>();