需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/big/BigLogic.java

@@ -85,6 +85,23 @@ public class BigLogic {
     @Autowired
     WebsitUserService websitUserService;
 
+    @Autowired
+    WebsitPartsSalesService websitPartsSalesService;
+
+
+
+    @Autowired
+    WebsitPartsNewRefundManageService websitPartsNewRefundManageService;
+
+    @Autowired
+    WebsitPartsNewRefundManageItemService websitPartsNewRefundManageItemService;
+
+    @Autowired
+    WebsitPartsOldRefundManageService websitPartsOldRefundManageService;
+
+    @Autowired
+    WebsitPartsOldRefundManageItemService websitPartsOldRefundManageItemService;
+
 
     public String getRegion(String country, String province, String city, String area) {
 
@@ -424,9 +441,13 @@ public class BigLogic {
                 item.getGoodsType().equals("M")
         ).count()));
 
-        largeMpBean.setPjxs(Convert.toInt(websitSales.stream().filter(item ->
-                item.getGoodsType().equals("P")
-        ).count()));
+
+        List<WebsitPartsSales> websitPartsSales = websitPartsSalesService.lambdaQuery().in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitPartsSales::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(websitIds) && !adminUser.getIsMaster(), WebsitPartsSales::getWebsitId, websitIds)
+                .eq(WebsitPartsSales::getDel, false)
+                .select(WebsitPartsSales::getId).list();
+
+        largeMpBean.setPjxs(Convert.toInt(websitPartsSales.stream().count()));
 
 
         List<WebsitSalesRet> websitSalesRets = websitSalesRetService.lambdaQuery()
@@ -441,52 +462,39 @@ public class BigLogic {
         ).count()));
 
 
-        largeMpBean.setPjth(Convert.toInt(websitSalesRets.stream().filter(item ->
-                item.getGoodsType().equals("P")
-        ).count()));
-
-
-        List<WebsitPartsRet> websitPartsRets = websitPartsRetService.lambdaQuery()
-                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitPartsRet::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .in(!CollectionUtils.isEmpty(websitIds)  && !adminUser.getIsMaster(), WebsitPartsRet::getWebsitId, websitIds)
-                .eq(WebsitPartsRet::getFlag, "SUBMIT")
-                .between(WebsitPartsRet::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -30), new Date())
-                .select(WebsitPartsRet::getFlag, WebsitPartsRet::getGoodsType, WebsitPartsRet::getPartsRetId, WebsitPartsRet::getType)
-                .list();
-
-        List<String> partRetIds = websitPartsRets.stream().map(WebsitPartsRet::getPartsRetId).collect(Collectors.toList());
+        List<WebsitPartsNewRefundManage> websitPartsNewRefundManages = websitPartsNewRefundManageService.lambdaQuery()
+                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitPartsNewRefundManage::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(websitIds) && !adminUser.getIsMaster(), WebsitPartsNewRefundManage::getReceiveWebsitId, websitIds)
+                .select(WebsitPartsNewRefundManage::getApplyNo).list();
 
-        if (!CollectionUtils.isEmpty(partRetIds)) {
+        List<String> partsNewIds = websitPartsNewRefundManages.stream().map(WebsitPartsNewRefundManage::getApplyNo).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(partsNewIds)){
 
-            List<WebsitPartsRetItem> websitPartsRetItemList = websitPartsRetItemService.lambdaQuery()
-                    .in(WebsitPartsRetItem::getPartsRetId, partRetIds)
-                    .select(WebsitPartsRetItem::getNewRefundQty, WebsitPartsRetItem::getOldRefundQty, WebsitPartsRetItem::getPartsRetId).list();
+            List<WebsitPartsNewRefundManageItem> websitPartsNewRefundManageItems = websitPartsNewRefundManageItemService.lambdaQuery()
+                    .in(WebsitPartsNewRefundManageItem::getApplyNo, partsNewIds)
+                    .select(WebsitPartsNewRefundManageItem::getQty).list();
 
+            largeMpBean.setXjdfh(websitPartsNewRefundManageItems.stream()
+                    .map(WebsitPartsNewRefundManageItem::getQty).reduce(BigDecimal::add).orElse(Convert.toBigDecimal("0")));
 
-            List<String> partRetNewIds = websitPartsRets.stream()
-                    .filter(item -> item.getType().equals("NEW"))
-                    .map(WebsitPartsRet::getPartsRetId).collect(Collectors.toList());
+        }
 
-            largeMpBean.setXjdfh(websitPartsRetItemList.stream().filter(item -> partRetNewIds.contains(item.getPartsRetId()))
-                    .map(WebsitPartsRetItem::getNewRefundQty).reduce(BigDecimal::add).orElse(Convert.toBigDecimal("0"))
-            );
 
-            List<String> partRetOldIds = websitPartsRets.stream()
-                    .filter(item -> item.getType().equals("OLD"))
-                    .map(WebsitPartsRet::getPartsRetId).collect(Collectors.toList());
 
-            largeMpBean.setJjdfh(websitPartsRetItemList.stream().filter(item -> partRetOldIds.contains(item.getPartsRetId()))
-                    .map(WebsitPartsRetItem::getOldRefundQty).reduce(BigDecimal::add).orElse(Convert.toBigDecimal("0"))
-            );
+        List<WebsitPartsOldRefundManage> websitPartsOldRefundManages = websitPartsOldRefundManageService.lambdaQuery()
+                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitPartsOldRefundManage::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(websitIds) && !adminUser.getIsMaster(), WebsitPartsOldRefundManage::getReceiveWebsitId, websitIds)
+                .select(WebsitPartsOldRefundManage::getApplyNo).list();
 
+        List<String> partsOldIds = websitPartsOldRefundManages.stream().map(WebsitPartsOldRefundManage::getApplyNo).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(partsOldIds)){
 
-            List<String> partRetFaIds = websitPartsRets.stream()
-                    .filter(item -> item.getType().equals("FACTORY"))
-                    .map(WebsitPartsRet::getPartsRetId).collect(Collectors.toList());
+            List<WebsitPartsOldRefundManageItem> websitPartsOldRefundManageItems = websitPartsOldRefundManageItemService.lambdaQuery()
+                    .in(WebsitPartsOldRefundManageItem::getApplyNo, partsOldIds)
+                    .select(WebsitPartsOldRefundManageItem::getQty).list();
 
-            largeMpBean.setJjdfc(websitPartsRetItemList.stream().filter(item -> partRetFaIds.contains(item.getPartsRetId()))
-                    .map(WebsitPartsRetItem::getOldRefundQty).reduce(BigDecimal::add).orElse(Convert.toBigDecimal("0"))
-            );
+            largeMpBean.setJjdfh(websitPartsOldRefundManageItems.stream()
+                    .map(WebsitPartsOldRefundManageItem::getQty).reduce(BigDecimal::add).orElse(Convert.toBigDecimal("0")));
 
         }