From a0373d6b939d71878ccfcc067cbb4efa6d803830 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 28 三月 2020 00:16:24 +0800
Subject: [PATCH] Merge branch 'back' of https://github.com/java110/MicroCommunity into back
---
StoreService/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/StoreService/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java b/StoreService/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
index 93c0b93..793ddb0 100644
--- a/StoreService/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
+++ b/StoreService/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
@@ -61,6 +61,34 @@
return purchaseApplys;
}
+ @Override
+ public List<PurchaseApplyDto> queryPurchaseApplyAndDetails(@RequestBody PurchaseApplyDto purchaseApplyDto) {
+
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = purchaseApplyDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ purchaseApplyDto.setPage((page - 1) * purchaseApplyDto.getRow());
+ }
+
+ List<PurchaseApplyDto> purchaseApplys = BeanConvertUtil.covertBeanList(purchaseApplyServiceDaoImpl.getPurchaseApplyInfo2(BeanConvertUtil.beanCovertMap(purchaseApplyDto)), PurchaseApplyDto.class);
+
+ if (purchaseApplys == null || purchaseApplys.size() == 0) {
+ return purchaseApplys;
+ }
+
+ String[] userIds = getUserIds(purchaseApplys);
+ //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
+ List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+ for (PurchaseApplyDto purchaseApply : purchaseApplys) {
+ refreshPurchaseApply(purchaseApply, users);
+ }
+ return purchaseApplys;
+ }
+
+
/**
* 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
*
--
Gitblit v1.8.0