Merge branch 'master-invoice-modular' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/QueryOrderDTO.java

@@ -38,4 +38,9 @@ public class QueryOrderDTO extends PageParam {
     private Integer type;
 
     private String multiTypes;
+
+    /**
+     * 开票状态，0未开票，1已开票
+     */
+    private Integer invoiceStatus;
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java

@@ -94,12 +94,12 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 		String[] orderIdArray = orderIds.split(",");
 		if (orderIdArray.length > 0) {
 			for (int a = 0; a <= orderIdArray.length; a++) {
-				Example example = new Example(OrderInvoice.class);
-				example.createCriteria().andEqualTo("crtUser", appUserDTO.getUserid()).andLike("orderIds", "%" + orderIdArray[a] + "%");
-				OrderInvoice orderInvoice = mapper.selectOneByExample(example);
+				OrderInvoice orderInvoice = selectByUserIdAndOrderId(appUserDTO.getUserid(), Integer.parseInt(orderIdArray[a])).getData();
+				if(orderInvoice != null) {
 					set.add(orderInvoice);
 				}
 			}
+		}
 		return ObjectRestResponse.succ(set);
 	}
 
@@ -135,9 +135,11 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 	}
 
 	public ObjectRestResponse<OrderInvoice> selectByUserIdAndOrderId(Integer userId, Integer orderId) {
-		Example example = new Example(OrderInvoice.class);
-		example.createCriteria().andEqualTo("crtUser", userId).andLike("orderIds", "%" + orderId + "%");
-		return ObjectRestResponse.succ(mapper.selectOneByExample(example));
+
+		return ObjectRestResponse.succ(mapper.selectByUserIdAndOrderId(new OrderInvoice(){{
+			setCrtUser(userId);
+			setOrderIds(orderId + "");
+		}}));
 	}
 
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderInvoiceMapper.java

@@ -4,4 +4,6 @@ import com.xxfc.platform.order.entity.OrderInvoice;
 import tk.mybatis.mapper.common.Mapper;
 
 public interface OrderInvoiceMapper extends Mapper<OrderInvoice> {
+
+	OrderInvoice selectByUserIdAndOrderId(OrderInvoice orderInvoice);
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -68,6 +68,9 @@
             <if test="type != null">
                 and type = #{type}
             </if>
+            <if test="invoiceStatus != null">
+                and invoice_status = #{invoiceStatus}
+            </if>
             <if test="hasMemberRight != null">
                 and has_member_right = #{hasMemberRight}
             </if>

xx-order/xx-order-server/src/main/resources/mapper/OrderInvoiceMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.order.mapper.OrderInvoiceMapper" >
-
+    <select id="selectByUserIdAndOrderId" parameterType="com.xxfc.platform.order.entity.OrderInvoice" resultType="com.xxfc.platform.order.entity.OrderInvoice">
+        select * from order_e_invoice where crt_user = #{crtUser} and ids like concat("%", ids, "%")
+    </select>
 </mapper>
\ No newline at end of file