优化

client-app/src/main/java/com/sapit/client/app/third/service/order/ThirdOrderManageService1.java

@@ -52,18 +52,19 @@ public class ThirdOrderManageService1 {
 			orderProgress.setReceiveOrderDate(DateUtil.getSqlToday());
 			thirdOrderManageService1impl.saveOrderProgress(orderProgress);
 
-			Long sysAreaId = commonApiService.getSysAreaId();
-			OrderPrintMQBean bean = new OrderPrintMQBean();
-			bean.setOrderId(orderV.getOrderId().toString());
-			bean.setTakeupCode(orderV.getTakeupCode());
-			rabbitTool.putQueue("a" + sysAreaId + "orderprint1", bean);
+			sendPrintMQ(orderV.getOrderId(), orderV.getTakeupCode());
 		}
 	}
 
 	public void printOrder(Long orderId) {
+		sendPrintMQ(orderId, null);
+	}
+
+	private void sendPrintMQ(Long orderId, String takeupCode) {
 		Long sysAreaId = commonApiService.getSysAreaId();
 		OrderPrintMQBean bean = new OrderPrintMQBean();
 		bean.setOrderId(orderId.toString());
+		bean.setTakeupCode(takeupCode);
 		rabbitTool.putQueue("a" + sysAreaId + "orderprint1", bean);
 	}
 

client-app/src/main/java/com/sapit/client/app/third/service/order/ThirdOrderManageService1impl.java

@@ -44,10 +44,10 @@ public class ThirdOrderManageService1impl extends BaseDao {
 		if (StringUtils.isNotBlank(searchBean.getOrderTel())) {
 			hql.append(" AND ORDER_TEL LIKE '%" + searchBean.getOrderTel() + "%'");
 		}
-		if (searchBean.getStatus() != null && searchBean.getStatus().equals(OrderStatus.SELF_TAKING)) {
-			hql.append(" AND ORDER_TYPE != " + OrderType.UP);
-		}
 		if (searchBean.getStatus() != null) {
+			if (searchBean.getStatus().equals(OrderStatus.SELF_TAKING)) {
+				hql.append(" AND ORDER_TYPE != " + OrderType.UP);
+			}
 			if (searchBean.getStatus().equals(OrderStatus.REFUND)) {
 				hql.append(" AND STATUS IN (-20, -50)");
 			} else {
@@ -60,11 +60,13 @@ public class ThirdOrderManageService1impl extends BaseDao {
 
 	public OrderNumBean getReceivedAndRefundOrderNum(BuOrderSearchBean searchBean) {
 		OrderNumBean bean = new OrderNumBean();
+		Long savedStatus = searchBean.getStatus();
 		searchBean.setStatus(null);
 		StringBuilder sql = new StringBuilder();
 		sql.append("SELECT status, COUNT( ORDER_ID ) FROM bu_order WHERE (STATUS = 20 OR STATUS = -20 OR STATUS = -50)")
 			.append(searchBean.getSerchCondition())
 			.append(" GROUP BY STATUS");
+		searchBean.setStatus(savedStatus);
 
 		List<Object> orderList = this.searchBySql(sql.toString());
 		Long refundNum = 0L;
@@ -87,15 +89,15 @@ public class ThirdOrderManageService1impl extends BaseDao {
 	}
 
 	public BuOrderV getOrderByOrderCode(String orderCode) {
-		List<BuOrderV> list = this.searchByHql("from BuOrderV where ORDER_CODE = '" + orderCode + "'");
-		if (list != null && !list.isEmpty()) {
-			return list.get(0);
-		}
-		return null;
+		return getOrderByCondition("ORDER_CODE = '" + orderCode + "'");
 	}
 
 	public BuOrderV getOrderV(Long orderId) {
-		List<BuOrderV> list = this.searchByHql("from BuOrderV where ORDER_ID = " + orderId);
+		return getOrderByCondition("ORDER_ID = " + orderId);
+	}
+
+	private BuOrderV getOrderByCondition(String condition) {
+		List<BuOrderV> list = this.searchByHql("from BuOrderV where " + condition);
 		if (list != null && !list.isEmpty()) {
 			return list.get(0);
 		}