fix AI类型订单都可开发票

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

@@ -17,10 +17,10 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = " order_don o left join user_invoice_order_relate uor on uor.order_id = o.id" +
-		" inner join goods_don g on g.id = o.goods_id" +
-		" inner join goods_don_sku sku on sku.id = o.sku_id and sku.is_mirror is true" +
+		" inner join goods_don g on g.id = o.goods_id and g.id in (select goods_id from goods_don_category_relate where category = 1)" +
+		" inner join goods_don_sku sku on sku.id = o.sku_id" +
 		" inner join shop_config sc on sc.app_id = o.shop_id",
-		where = "o.money > 0 and uor.id is null and o.status not in ('close','noPayment','refund')",
+		where = "o.money > 0 and uor.id is null and o.status not in ('close','noPayment','refund') and o.type = 'ALI_PAY' :dc:",
 		orderBy = "o.id desc")
 public class UserInvoiceChoseOrderViews {
 

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

@@ -1,5 +1,7 @@
 package com.cyksj.web.controller.invoice;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.request.UserInvoiceOrderReq;
@@ -44,7 +46,17 @@ public class UserInvoiceFrontController {
 	public Result<SearchResult<UserInvoiceChoseOrderViews>> getOrders() {
 		long userId = StpUserUtil.getLoginIdAsLong();
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		String dateCondition;
+		DateTime now = DateTime.now();
+		String thisSixMontStr = DateUtil.thisYear() + "-06-01";
+		//当前时间达到6月份 可开发票的订单只能是24年的 去年的发票只能截至到次年5月底
+		if (now.isAfter(DateUtil.parse(thisSixMontStr))) {
+			dateCondition = String.format(" and o.created_time >= '%s'", DateUtil.beginOfYear(now));
+		} else {
+			dateCondition = String.format(" and o.created_time >= '%s'", DateUtil.offsetMonth(DateUtil.beginOfYear(now), -12));
+		}
 		SearchResult<UserInvoiceChoseOrderViews> search = beanSearcher.search(UserInvoiceChoseOrderViews.class, MapUtils.flatBuilder(request.getParameterMap())
+				.put("dc", dateCondition)
 				.field(UserInvoiceChoseOrderViews::getUserId, userIdList).op(Operator.InList)
 				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);