Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderItemScrm.java

@@ -59,5 +59,17 @@ public class FsStoreOrderItemScrm extends BaseEntity
 
     private Integer isDrug;
 
-
+    /**
+     * 上市许可持有人
+     */
+    private String mah;
+    /**
+     * 药品注册证书编号
+     */
+    private String drugRegCertNo;
+
+    /**
+     * 批次号
+     */
+    private String batchNumber;
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderItemScrmServiceImpl.java

@@ -2,11 +2,17 @@ package com.fs.hisStore.service.impl;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.fs.his.vo.FsStoreOrderItemListDVO;
+import com.fs.hisStore.mapper.FsStoreProductScrmMapper;
 import com.fs.hisStore.param.FsStoreOrderParam;
 import com.fs.hisStore.vo.FsStoreOrderItemExportVO;
 import com.fs.hisStore.vo.FsStoreOrderItemVO;
+import com.fs.hisStore.vo.FsStoreProductActivityListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.hisStore.mapper.FsStoreOrderItemScrmMapper;
@@ -24,6 +30,8 @@ public class FsStoreOrderItemScrmServiceImpl implements IFsStoreOrderItemScrmSer
 {
     @Autowired
     private FsStoreOrderItemScrmMapper fsStoreOrderItemMapper;
+    @Autowired
+    private FsStoreProductScrmMapper fsStoreProductScrmMapper;
 
     /**
      * 查询订单详情
@@ -46,7 +54,22 @@ public class FsStoreOrderItemScrmServiceImpl implements IFsStoreOrderItemScrmSer
     @Override
     public List<FsStoreOrderItemScrm> selectFsStoreOrderItemList(FsStoreOrderItemScrm fsStoreOrderItem)
     {
-        return fsStoreOrderItemMapper.selectFsStoreOrderItemList(fsStoreOrderItem);
+        List<FsStoreOrderItemScrm> resList =  fsStoreOrderItemMapper.selectFsStoreOrderItemList(fsStoreOrderItem);
+        if (resList == null || resList.isEmpty()) {
+            return resList;
+        }
+        String stringIds = resList.stream().map(item -> item.getProductId().toString()).distinct().collect(Collectors.joining(","));
+        List<FsStoreProductActivityListVO> fsStoreProductActivityListVOS = fsStoreProductScrmMapper.selectFsStoreProductByIds(stringIds);
+        Map<Long, FsStoreProductActivityListVO> mp = fsStoreProductActivityListVOS.stream().collect(Collectors.toMap(FsStoreProductActivityListVO::getProductId, Function.identity(), (existing, replacement) -> existing));
+        for (FsStoreOrderItemScrm item : resList) {
+            FsStoreProductActivityListVO activity = mp.get(item.getProductId());
+            if(null != activity){
+                item.setMah(activity.getMah());
+                item.setDrugRegCertNo(activity.getDrugRegCertNo());
+                item.setBatchNumber(activity.getBatchNumber());
+            }
+        }
+        return resList;
     }
 
     /**