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

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

@@ -1,5 +1,7 @@
 package com.fs.hisStore.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
@@ -14,6 +16,7 @@ import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsUser;
 import com.fs.his.service.IFsUserService;
 import com.fs.hisStore.domain.*;
+import com.fs.hisStore.mapper.FsStoreVerifyCodeScrmMapper;
 import com.fs.hisStore.param.FsStoreAfterSalesAudit1Param;
 import com.fs.hisStore.param.FsStoreAfterSalesAudit2Param;
 import com.fs.hisStore.param.FsStoreAfterSalesCancelParam;
@@ -25,7 +28,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 售后记录Controller
@@ -53,6 +58,10 @@ public class FsStoreAfterSalesScrmController extends BaseController
 
     @Autowired
     private TokenService tokenService;
+
+    @Autowired
+    private FsStoreVerifyCodeScrmMapper fsStoreVerifyCodeService;
+
     /**
      * 查询售后记录列表
      */
@@ -106,9 +115,31 @@ public class FsStoreAfterSalesScrmController extends BaseController
         statusMap.setStoreAfterSalesId(id);
         List<FsStoreAfterSalesStatusScrm> logs=storeAfterSalesStatusService.selectFsStoreAfterSalesStatusList(statusMap);
         FsUser user=userService.selectFsUserById(afterSales.getUserId());
-        user.setPhone(ParseUtils.parsePhone(user.getPhone()));
+//        user.setPhone(ParseUtils.parsePhone(user.getPhone()));
         FsStoreOrderScrm order=fsStoreOrderService.selectFsStoreOrderByOrderCode(afterSales.getOrderCode());
         FsStoreScrm storeScrm = storeScrmService.selectFsStoreByStoreId(order.getStoreId());
+
+        //获取溯源码相关数据
+        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 (FsStoreAfterSalesItemScrm item : items){
+                if(verifyCodMap.containsKey(item.getProductId())){
+                    JSONObject jsonObject = JSONObject.parseObject(item.getJsonInfo());
+                    jsonObject.put("verifyCods", verifyCodMap.get(item.getProductId()));
+                    item.setJsonInfo(jsonObject.toJSONString());
+                }
+            }
+
+        }
         return R.ok().put("afterSales",afterSales).put("items",items).put("logs",logs).put("user",user).put("order",order).put("store",storeScrm);
     }
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
@@ -48,6 +49,7 @@ import com.fs.his.dto.ExpressInfoDTO;
 import com.fs.hisStore.dto.StoreOrderExpressExportDTO;
 import com.fs.hisStore.dto.StoreOrderProductDTO;
 import com.fs.hisStore.enums.ShipperCodeEnum;
+import com.fs.hisStore.mapper.FsStoreVerifyCodeScrmMapper;
 import com.fs.hisStore.param.*;
 import com.fs.hisStore.service.*;
 import com.fs.hisStore.vo.*;
@@ -140,6 +142,9 @@ public class FsStoreOrderScrmController extends BaseController {
     @Autowired
     private  IFsStoreScrmService iFsStoreScrmService;
 
+    @Autowired
+    private FsStoreVerifyCodeScrmMapper fsStoreVerifyCodeService;
+
     private IErpOrderService getErpService(){
         //判断是否开启erp
         IErpOrderService erpOrderService = null;
@@ -576,6 +581,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<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)
                 .put("auditLogs",auditLogs).put("storeScrm",storeScrm);

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreAfterSalesScrmMapper.java

@@ -274,12 +274,14 @@ public interface FsStoreAfterSalesScrmMapper
             "</script>"})
     List<FsStoreAfterSalesExcelVO> selectFsStoreAfterSalesExcelListVO(@Param("maps") FsStoreAfterSalesParam fsStoreAfterSales);
 
-    @Select("select so.*,st.store_name,us.nick_name,us.phone,fso.order_code " +
+
+    @Select("select so.*,st.store_name,us.nick_name,us.phone,fso.order_code, GROUP_CONCAT(cs.verify_code) AS verifyCodes " +
             "FROM fs_store_after_sales_scrm so " +
             "LEFT JOIN fs_store_scrm st ON so.store_id =st.store_id " +
             "LEFT JOIN fs_user us ON us.user_id=so.user_id " +
             "LEFT JOIN fs_store_order_scrm fso ON fso.id=so.order_code " +
-            "WHERE so.id=#{id} ")
+            "LEFT JOIN fs_store_verify_code_scrm cs ON cs.order_id = fso.id " +
+            "WHERE so.id=#{id} GROUP BY so.id, st.store_name, us.nick_name, us.phone, fso.order_code;")
     FsStoreAfterSalesVO selectFsStoreAfterSalesVOById(Long id);
 
     @Select("select * FROM fs_store_after_sales_item_scrm WHERE store_after_sales_id =#{id}")

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

@@ -2,6 +2,8 @@ package com.fs.hisStore.controller.store;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fs.common.BeanCopyUtils;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -33,6 +35,7 @@ import com.fs.his.vo.FsStoreOrderExcelVO;
 import com.fs.his.vo.FsStoreOrderStoreExcelVO;
 import com.fs.hisStore.domain.*;
 import com.fs.hisStore.mapper.FsStoreOrderItemScrmMapper;
+import com.fs.hisStore.mapper.FsStoreVerifyCodeScrmMapper;
 import com.fs.hisStore.param.FsStoreOrderExpressEditParam;
 import com.fs.hisStore.param.FsStoreOrderParam;
 import com.fs.hisStore.service.*;
@@ -48,7 +51,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单Controller
@@ -109,6 +114,9 @@ public class FsStoreOrderScrmController extends BaseController
     @Autowired
     private IFsStoreOrderAuditLogScrmService orderAuditLogService;
 
+    @Autowired
+    private FsStoreVerifyCodeScrmMapper fsStoreVerifyCodeService;
+
     /**
      * 查询订单列表
      */
@@ -220,6 +228,28 @@ 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<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)
                 .put("auditLogs",auditLogs);