Merge branch 'master-invoice-modular' into dev

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

@@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashSet;
@@ -113,18 +112,13 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 	 * 获取用户的发票记录列表
 	 * @return
 	 */
-	public ObjectRestResponse<List<OrderInvoice>> selectByToken(Integer type) {
+	public ObjectRestResponse<List<OrderInvoice>> selectByToken(OrderInvoiceDto orderInvoiceDto) {
 		AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
 		if (appUserDTO == null) {
 			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
 		}
-		Example example = new Example(OrderInvoice.class);
-		Example.Criteria criteria = example.createCriteria();
-		criteria.andEqualTo("userId", appUserDTO.getUserid());
-		if (type != null) {
-			criteria.andEqualTo("type", type);
-		}
-		return ObjectRestResponse.succ(mapper.selectByExample(example));
+		orderInvoiceDto.setUserId(appUserDTO.getUserid());
+		return ObjectRestResponse.succ(getByParam(orderInvoiceDto));
 	}
 
 	/**
@@ -132,14 +126,8 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 	 * @param userId
 	 * @return
 	 */
-	public ObjectRestResponse<List<OrderInvoice>> selectByUserId(Integer userId, Integer type) {
-		Example example = new Example(OrderInvoice.class);
-		Example.Criteria criteria = example.createCriteria();
-		criteria.andEqualTo("userId", userId);
-		if (type != null) {
-			criteria.andEqualTo("type", type);
-		}
-		return ObjectRestResponse.succ(mapper.selectByExample(example));
+	public ObjectRestResponse<List<OrderInvoice>> selectByUserId(OrderInvoiceDto orderInvoiceDto) {
+		return ObjectRestResponse.succ(getByParam(orderInvoiceDto));
 	}
 
 	public ObjectRestResponse<OrderInvoice> selectByUserIdAndOrderId(Integer userId, Integer orderId) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderInvoiceController.java

@@ -28,13 +28,13 @@ public class OrderInvoiceController extends BaseController<OrderInvoiceBiz, Orde
 	}
 
 	@GetMapping(value = "selectByType")
-	public  ObjectRestResponse<List<OrderInvoice>> selectByToken(Integer type) {
-		return baseBiz.selectByToken(type);
+	public  ObjectRestResponse<List<OrderInvoice>> selectByToken(OrderInvoiceDto orderInvoiceDto) {
+		return baseBiz.selectByToken(orderInvoiceDto);
 	}
 
 	@GetMapping(value = "getByUser")
-	public ObjectRestResponse<List<OrderInvoice>> selectByUserId(Integer userId, Integer type) {
-		return baseBiz.selectByUserId(userId, type);
+	public ObjectRestResponse<List<OrderInvoice>> selectByUserId(OrderInvoiceDto orderInvoiceDto) {
+		return baseBiz.selectByUserId(orderInvoiceDto);
 	}
 
 	@GetMapping(value = "/getAll")