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

src/main/java/com/uas/platform/b2c/fa/settlement/model/BillSubmit.java

@@ -162,6 +162,12 @@ public class BillSubmit implements Serializable {
     @Column(name = "bs_currency")
     private String currency;
 
+    /**
+     * 是否个人用户
+     */
+    @Column(name = "bs_dissociative")
+    private Integer dissociative;
+
     public Long getId() {
         return id;
     }
@@ -372,4 +378,13 @@ public class BillSubmit implements Serializable {
         this.currency = currency;
         return this;
     }
+
+    public Integer getDissociative() {
+        return dissociative;
+    }
+
+    public BillSubmit setDissociative(Integer dissociative) {
+        this.dissociative = dissociative;
+        return this;
+    }
 }

src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/BillSubmitServiceImpl.java

@@ -170,6 +170,7 @@ public class BillSubmitServiceImpl implements BillSubmitService {
         billSubmit.setSellername(orders.get(0).getSellername());
         billSubmit.setSellerenuu(orders.get(0).getSellerenuu());
         billSubmit.setStoreid(orders.get(0).getStoreid());
+        billSubmit.setDissociative(orders.get(0).getDissociative());
         billSubmit.setPrice(price);
         billSubmit.setOrderids(orderIds);
         if (StringUtils.isEmpty(purchaseIds)){
@@ -236,6 +237,7 @@ public class BillSubmitServiceImpl implements BillSubmitService {
             billSubmit.setSellername(purchases.get(0).getSellername());
             billSubmit.setSellerenuu(purchases.get(0).getSellerenuu());
             billSubmit.setStoreid(purchases.get(0).getStoreid());
+            billSubmit.setDissociative(Type.ENTERPRISING.value());
             billSubmit.setPrice(price);
             if (StringUtils.isEmpty(orderIds)) {
                 billSubmit.setOrderids(orderIds);
@@ -298,6 +300,7 @@ public class BillSubmitServiceImpl implements BillSubmitService {
         billSubmit.setPurchaseids(purchaseIds);
         billSubmit.setPrice(order.getPrice());
         billSubmit.setOrderids(order.getOrderid());
+        billSubmit.setDissociative(order.getDissociative());
         BillSubmit submit = billSubmitDao.save(billSubmit);
         billSubmitDao.save(list);
 
@@ -308,8 +311,12 @@ public class BillSubmitServiceImpl implements BillSubmitService {
     public Page<BillSubmit> getAll(final PageInfo pageInfo, String keyword, String invoicetype , String status, String role) {
         if (Type.BUYER.name().equals(role)) {
             pageInfo.expression(PredicateUtils.eq("submituu", SystemSession.getUser().getUserUU(), false));
-            if (SystemSession.getUser().getEnterprise() != null)
+            if (SystemSession.getUser().getEnterprise() != null) {
                 pageInfo.expression(PredicateUtils.eq("submitEnuu", SystemSession.getUser().getEnterprise().getUu(), false));
+            } else {
+                pageInfo.expression(PredicateUtils.eq("dissociative", Type.PERSONAL.value(), false));
+            }
+
         }
 
         if (Type.SELLER.name().equals(role)) {