获取未开票的订单时区分个人还是企业的

src/main/java/com/uas/platform/b2c/trade/order/controller/OrderController.java

@@ -6,6 +6,7 @@ import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.service.VendorService;
 import com.uas.platform.b2c.core.constant.SplitChar;
+import com.uas.platform.b2c.core.constant.Type;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
@@ -688,8 +689,12 @@ public class OrderController {
 	public Page<Order> getBillByStatusByPersonal(PageParams params, String keyword, int status) {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("buyeruu", SystemSession.getUser().getUserUU());
-		if (SystemSession.getUser().getEnterprise() != null)
+		if (SystemSession.getUser().getEnterprise() != null) {
 			pageInfo.filter("buyerenuu", SystemSession.getUser().getEnterprise().getUu());
+		} else {
+			pageInfo.filter("dissociative", Type.PERSONAL.value());
+		}
+
 		assert logger != null;
 		logger.log("买家订单管理", "买家获取买家订单信息", "获取待开发票的订单");
 		return orderService.getBillByStatus(pageInfo, keyword, status);

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -17,6 +17,7 @@ import com.uas.platform.b2c.common.message.type.SMSType;
 import com.uas.platform.b2c.common.psmessage.service.MessageService;
 import com.uas.platform.b2c.common.search.rpc.service.OrderSearchService;
 import com.uas.platform.b2c.core.config.SysConf;
+import com.uas.platform.b2c.core.constant.ShortConstant;
 import com.uas.platform.b2c.core.constant.SplitChar;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.TradeBufferedLogger;
@@ -2567,6 +2568,7 @@ public class OrderServiceImpl implements OrderService {
         page.expression(PredicateUtils.isNull("invoiceid"));
         page.expression(PredicateUtils.eq("invoicetype", Type.Bill_No.value(), false));
         page.expression(PredicateUtils.eq("currency", Currency.RMB, true));
+        page.expression(PredicateUtils.eq("used", ShortConstant.YES_SHORT, true));
 
         if (StringUtils.hasText(keyword)) {
             SimpleExpression sellername = new SimpleExpression("sellername", keyword , Operator.LIKE);