修改查询订单列表

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/AppBankController.java

@@ -171,14 +171,19 @@ public class AppBankController extends BaseController {
 		return ResponseDTO.success(detailDto);
 	}
 	@RequestMapping("/order/search")
-	public ResponseDTO<?> orderSearch( @RequestBody OrderVo order ) {
+	public ResponseDTO<?> orderSearch(@RequestBody String json) {
 		 
-		if (order == null) {
-			return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
-		}
-		 List<OrderDto> orders = this.orderService.getOrderByContion(order);
-		
-		return ResponseDTO.success(orders);
+		JSONObject jsonObj = JSONObject.parseObject(json);
+		String phone = jsonObj.getString("phone");
+		String status = jsonObj.getString("status");
+		String contractNo = jsonObj.getString("contractNo");
+		Integer startIndex = 1;
+
+		Integer size = Integer.MAX_VALUE;
+
+		List<OrderEntity> list = borrowerService.getOrderList(contractNo,phone, status, startIndex, size);
+
+		return ResponseDTO.success(list);
 	}
 	/**
 	 * 提交订单
@@ -286,11 +291,12 @@ public class AppBankController extends BaseController {
 		JSONObject jsonObj = JSONObject.parseObject(json);
 		String phone = jsonObj.getString("phone");
 		String status = jsonObj.getString("status");
+		String contractNo = jsonObj.getString("contractNo");
 		Integer startIndex = 1;
 
 		Integer size = Integer.MAX_VALUE;
 
-		List<OrderEntity> list = borrowerService.getOrderList(phone, status, startIndex, size);
+		List<OrderEntity> list = borrowerService.getOrderList(contractNo,phone, status, startIndex, size);
 
 		return ResponseDTO.success(list);
 	}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/BorrowerService.java

@@ -32,7 +32,7 @@ public interface BorrowerService extends AbstractService<AppBorrowerEntity> {
 
 	public AppBaseResponse<OrderDetailDto> borrowerInfo(Map<String,String> map);
 
-	List<OrderEntity> getOrderList(String phone,String status, Integer pageIndex, Integer pageSize);
+	List<OrderEntity> getOrderList(String contractNo,String phone,String status, Integer pageIndex, Integer pageSize);
 
 	List<OrderDto> getSubOrderList(String businessNo,String status, Integer pageIndex, Integer pageSize);
 }

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BorrowerServiceImpl.java

@@ -22,6 +22,7 @@ import me.zhengjie.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -112,7 +113,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
 	}
 
     @Override
-    public List<OrderEntity> getOrderList(String phone, String status, Integer pageIndex, Integer pageSize) {
+    public List<OrderEntity> getOrderList(String contractNo,String phone, String status, Integer pageIndex, Integer pageSize) {
         QueryWrapper<SysUserEntity> qw = new QueryWrapper<>();
         qw.eq("phone", phone);
         SysUserEntity user = userDao.selectOne(qw);
@@ -121,6 +122,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
             QueryWrapper<OrderEntity> orderEntityQueryWrapper = new QueryWrapper<>();
 			orderEntityQueryWrapper.eq("customer_id", user.getUserId());
 			orderEntityQueryWrapper.eq("status",status);
+			orderEntityQueryWrapper.like(!ObjectUtils.isEmpty(contractNo), "contract_no", contractNo);
             List<OrderEntity> orderEntities = orderDaol.selectList(orderEntityQueryWrapper);
             list.addAll(orderEntities);
         }