店铺端，批次号和溯源码详情、分页拼接展示

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreAfterSalesScrmController.java

@@ -9,12 +9,15 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.his.vo.FsStoreAfterSalesExcelVO;
-import com.fs.his.vo.FsStoreAfterSalesListVO;
 import com.fs.hisStore.domain.FsStoreAfterSalesItemScrm;
 import com.fs.hisStore.domain.FsStoreAfterSalesScrm;
 import com.fs.his.param.FsStoreAfterSalesParam;
+import com.fs.hisStore.domain.FsStoreOrderItemScrm;
+import com.fs.hisStore.domain.FsStoreOrderScrm;
+import com.fs.hisStore.mapper.FsStoreOrderItemScrmMapper;
 import com.fs.hisStore.service.IFsStoreAfterSalesItemScrmService;
 import com.fs.hisStore.service.IFsStoreAfterSalesScrmService;
+import com.fs.hisStore.service.IFsStoreOrderScrmService;
 import com.fs.hisStore.utils.UserUtil;
 import com.fs.hisStore.vo.FsStoreAfterSalesVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +25,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 售后记录Controller
@@ -40,6 +45,12 @@ public class FsStoreAfterSalesScrmController extends BaseController
     @Autowired
     private IFsStoreAfterSalesItemScrmService afterSalesItemService;
 
+    @Autowired
+    private FsStoreOrderItemScrmMapper fsStoreOrderItemMapper;
+
+    @Autowired
+    private IFsStoreOrderScrmService fsStoreOrderService;
+
     /**
      * 查询售后记录列表
      */
@@ -197,7 +208,31 @@ public class FsStoreAfterSalesScrmController extends BaseController
         }
         FsStoreAfterSalesItemScrm salesItemScrm=new FsStoreAfterSalesItemScrm();
         salesItemScrm.setStoreAfterSalesId(id);
-        return R.ok().put("data",afterSalesItemService.selectFsStoreAfterSalesItemList(salesItemScrm));
+        //查询售后信息
+        FsStoreAfterSalesScrm afterSales=fsStoreAfterSalesService.selectFsStoreAfterSalesById(id);
+        if(afterSales == null){
+            return R.error("操作失败，售后信息不存在！");
+        }
+        FsStoreOrderScrm order=fsStoreOrderService.selectFsStoreOrderByOrderCode(afterSales.getOrderCode());
+        List<FsStoreAfterSalesItemScrm> items = afterSalesItemService.selectFsStoreAfterSalesItemList(salesItemScrm);
+        if(!items.isEmpty()){
+            FsStoreOrderItemScrm fsStoreOrderItem=new FsStoreOrderItemScrm();
+            fsStoreOrderItem.setOrderId(order.getId());
+            List<FsStoreOrderItemScrm> fsStoreOrderItemScrmList = fsStoreOrderItemMapper.selectFsStoreOrderItemList(fsStoreOrderItem);
+            Map<Long,FsStoreOrderItemScrm> itemMap = fsStoreOrderItemScrmList.stream().collect(Collectors.toMap(i->i.getProductId(), item->item));
+            for (FsStoreAfterSalesItemScrm item : items){
+                if(itemMap.containsKey(item.getProductId())){
+                    FsStoreOrderItemScrm itemScrm=itemMap.get(item.getProductId());
+                    if(itemScrm.getVerifyCode() != null){
+                        item.setVerifyCode(itemScrm.getVerifyCode());
+                    }
+                    if(itemScrm.getBatchNumber() != null){
+                        item.setBatchNumber(itemScrm.getBatchNumber());
+                    }
+                }
+            }
+        }
+        return R.ok().put("data",items);
     }
 
 

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreOrderScrmController.java

@@ -268,27 +268,27 @@ public class FsStoreOrderScrmController extends BaseController
             tuiMoneyLogs=moneyLogsService.selectCompanyStoreOrderMoneyLogsList(moneyLogsMap);
         }
 
-        //获取溯源码相关数据
-        List<FsStoreVerifyCodeScrm> verifyCodes = fsStoreVerifyCodeService.selectList(new LambdaQueryWrapper<FsStoreVerifyCodeScrm>().select(FsStoreVerifyCodeScrm::getVerifyCode,FsStoreVerifyCodeScrm::getProductId).eq(FsStoreVerifyCodeScrm::getOrderId, order.getId()));
-        if(!verifyCodes.isEmpty()){
-            Map<Long, String> verifyCodMap=new HashMap<>();
-            for (FsStoreVerifyCodeScrm v : verifyCodes){
-                if(verifyCodMap.containsKey(v.getProductId())){
-                    verifyCodMap.put(v.getProductId(),verifyCodMap.get(v.getProductId())+","+v.getVerifyCode());
-                }else {
-                    verifyCodMap.put(v.getProductId(),v.getVerifyCode());
-                }
-            }
-
-            for (FsStoreOrderItemScrm item : items){
-                if(verifyCodMap.containsKey(item.getProductId())){
-                    JSONObject jsonObject = JSONObject.parseObject(item.getJsonInfo());
-                    jsonObject.put("verifyCods", verifyCodMap.get(item.getProductId()));
-                    item.setJsonInfo(jsonObject.toJSONString());
-                }
-            }
-
-        }
+//        //获取溯源码相关数据
+//        List<FsStoreVerifyCodeScrm> verifyCodes = fsStoreVerifyCodeService.selectList(new LambdaQueryWrapper<FsStoreVerifyCodeScrm>().select(FsStoreVerifyCodeScrm::getVerifyCode,FsStoreVerifyCodeScrm::getProductId).eq(FsStoreVerifyCodeScrm::getOrderId, order.getId()));
+//        if(!verifyCodes.isEmpty()){
+//            Map<Long, String> verifyCodMap=new HashMap<>();
+//            for (FsStoreVerifyCodeScrm v : verifyCodes){
+//                if(verifyCodMap.containsKey(v.getProductId())){
+//                    verifyCodMap.put(v.getProductId(),verifyCodMap.get(v.getProductId())+","+v.getVerifyCode());
+//                }else {
+//                    verifyCodMap.put(v.getProductId(),v.getVerifyCode());
+//                }
+//            }
+//
+//            for (FsStoreOrderItemScrm item : items){
+//                if(verifyCodMap.containsKey(item.getProductId())){
+//                    JSONObject jsonObject = JSONObject.parseObject(item.getJsonInfo());
+//                    jsonObject.put("verifyCods", verifyCodMap.get(item.getProductId()));
+//                    item.setJsonInfo(jsonObject.toJSONString());
+//                }
+//            }
+//
+//        }
 
         List<FsStoreOrderAuditLogVO> auditLogs = orderAuditLogService.selectStoreOrderAuditLogVOByOrderId(order.getId());
         return R.ok().put("order", order).put("items", items).put("logs", logs).put("user", user).put("payments",payments).put("tuiMoneyLogs",tuiMoneyLogs)