二级售后原因添加

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

@@ -17,7 +17,6 @@ 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.FsRefundReasonMapper;
 import com.fs.hisStore.param.FsStoreAfterSalesAudit1Param;
 import com.fs.hisStore.param.FsStoreAfterSalesAudit2Param;
 import com.fs.hisStore.param.FsStoreAfterSalesCancelParam;
@@ -37,10 +36,8 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 售后记录Controller
@@ -72,10 +69,6 @@ public class FsStoreAfterSalesScrmController extends BaseController
     @Autowired
     private CloudHostProper cloudHostProper;
 
-
-    @Autowired
-    private FsRefundReasonMapper fsRefundReasonMapper;
-
     /**
      * 查询售后记录列表
      */
@@ -93,28 +86,6 @@ public class FsStoreAfterSalesScrmController extends BaseController
             }
         }
 
-        if(!list.isEmpty()){//不为空获取审核信息
-            List<Long> reasonId = list.stream()
-                    .flatMap(vo -> Stream.of(vo.getReasonId1(), vo.getReasonId2()))
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
-
-          if(!reasonId.isEmpty()){
-              List<FsRefundReason> refundReasons = fsRefundReasonMapper.getFsRefundReasonList(reasonId);
-              if(!refundReasons.isEmpty()){
-                  Map<Long,String> map = refundReasons.stream().collect(Collectors.toMap(FsRefundReason::getId, FsRefundReason::getReasonName));
-                  list.forEach(vo -> {
-                      if(vo.getReasonId1() != null){
-                          vo.setReasonValue1(map.get(vo.getReasonId1()));
-                      }
-                      if(vo.getReasonId2() != null){
-                          vo.setReasonValue2(map.get(vo.getReasonId2()));
-                      }
-                  });
-              }
-          }
-        }
-
         return getDataTable(list);
     }
 
@@ -137,19 +108,7 @@ public class FsStoreAfterSalesScrmController extends BaseController
 
         List<FsStoreAfterSalesVO> list = fsStoreAfterSalesService.selectFsStoreAfterSalesListVOExport(fsStoreAfterSales);
         if("北京卓美".equals(signProjectName)) {
-            Map<Long, String> map = null;
-            if (!list.isEmpty()) {//不为空获取审核信息
-                List<Long> reasonId = list.stream()
-                        .flatMap(vo -> Stream.of(vo.getReasonId1(), vo.getReasonId2()))
-                        .filter(Objects::nonNull)
-                        .collect(Collectors.toList());
-                List<FsRefundReason> refundReasons = fsRefundReasonMapper.getFsRefundReasonList(reasonId);
-                if (!refundReasons.isEmpty()) {
-                    map = refundReasons.stream().collect(Collectors.toMap(FsRefundReason::getId, FsRefundReason::getReasonName));
-                }
-
-                List<Long> finalReasonId = reasonId;
-                Map<Long, String> finalMap = map;
+            if (!list.isEmpty()) {
                 List<FsStoreOrderItemExportRefundZMVO> zmvoList = list.stream()
                         .map(vo -> {
                             FsStoreOrderItemExportRefundZMVO zmvo = new FsStoreOrderItemExportRefundZMVO();
@@ -164,7 +123,6 @@ public class FsStoreAfterSalesScrmController extends BaseController
                                 zmvo.setNum(vo.getNum());
                                 zmvo.setPrice(vo.getPrice());
                                 zmvo.setCost(vo.getCost());
-//                            zmvo.setFPrice("");
                                 zmvo.setPayMoney(vo.getPayMoney());
                                 zmvo.setPayPostage(vo.getTotalPostage());
                                 zmvo.setCateName(vo.getCateName());
@@ -179,22 +137,14 @@ public class FsStoreAfterSalesScrmController extends BaseController
                                 zmvo.setCompanyName(vo.getCompanyName());
                                 zmvo.setCompanyUserNickName(vo.getCompanyUserNickName());
                                 zmvo.setRefundTime(vo.getCreateTime());
-//                            zmvo.setAfterSalesNumber
                                 zmvo.setRefundMoney(vo.getRefundAmount());
                                 zmvo.setBankTransactionId(vo.getBankTransactionId());
                                 zmvo.setReasons(vo.getReasons());
                                 zmvo.setExplains(vo.getExplains());
-                                if (vo.getReasonId1() != null) {
-                                    zmvo.setReasonValue1(finalMap.get(vo.getReasonId1()));
-                                }
-                                if (vo.getReasonId2() != null) {
-                                    zmvo.setReasonValue2(finalMap.get(vo.getReasonId2()));
-                                }
-                                if (vo.getAuditRemark() != null) {
-                                    zmvo.setAuditRemark(vo.getAuditRemark());
-                                }
+                                zmvo.setReasonValue1(vo.getReasonValue1());
+                                zmvo.setReasonValue2(vo.getReasonValue2());
+                                zmvo.setAuditRemark(vo.getAuditRemark());
                             } catch (Exception e) {
-                                // 处理异常
                                 e.printStackTrace();
                             }
                             return zmvo;
@@ -221,7 +171,7 @@ public class FsStoreAfterSalesScrmController extends BaseController
     @GetMapping(value = "/{id}")
     public R getInfo(@PathVariable("id") Long id)
     {
-        FsStoreAfterSalesScrm afterSales=fsStoreAfterSalesService.selectFsStoreAfterSalesById(id);
+        FsStoreAfterSalesScrm afterSales=fsStoreAfterSalesService.selectFsStoreAfterSalesByIdForDetail(id);
         FsStoreAfterSalesItemScrm map=new FsStoreAfterSalesItemScrm();
         map.setStoreAfterSalesId(id);
         List<FsStoreAfterSalesItemScrm> items=fsStoreAfterSalesItemService.selectFsStoreAfterSalesItemList(map);

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

@@ -140,23 +140,27 @@ public class FsStoreAfterSalesScrm extends BaseEntity
 
     private String remark;
 
-    @TableField(exist = false)
+    /** 退款原因字典一级 ID */
     private Long reasonId1;
 
-    @TableField(exist = false)
+    /** 退款原因字典二级 ID */
     private Long reasonId2;
 
-    @TableField(exist = false)
+    /** 售后一级原因（文字，与 reason_id1 对应名称快照） */
+    private String reasonLevel1Text;
+
+    /** 售后二级原因（文字，与 reason_id2 对应名称快照） */
+    private String reasonLevel2Text;
+
     private String auditRemark;
 
-    @TableField(exist = false)
     private String auditReasonName;
 
-    /** 售后原因一级名称（关联 fs_refund_reason，仅查询展示） */
+    /** 列表/详情查询时别名映射：一级原因展示文案 */
     @TableField(exist = false)
     private String reasonValue1;
 
-    /** 售后原因二级名称（关联 fs_refund_reason，仅查询展示） */
+    /** 列表/详情查询时别名映射：二级原因展示文案 */
     @TableField(exist = false)
     private String reasonValue2;
 

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

@@ -91,14 +91,12 @@ public interface FsStoreAfterSalesScrmMapper
             "cu.phonenumber as company_usere_phonenumber,o.pay_money,o.id as orderId,o.create_time as orderCreateTime,o.user_phone," +
             "o.real_name as userName,o.item_json,o.user_address,o.pay_time as orderPayTime,o.pay_price,o.total_postage," +
             "fsps.bank_serial_no,fsps.bank_transaction_id,o.delivery_id as orderDeliveryId,o.delivery_name as orderDeliveryName,o.delivery_sn as orderDeliverySn," +
-            "o.status as orderStatus,fsps.pay_code as payCode, rr1.reason_name as reasonValue1, rr2.reason_name as reasonValue2 " +
+            "o.status as orderStatus,fsps.pay_code as payCode, s.reason_level1_text as reasonValue1, s.reason_level2_text as reasonValue2 " +
             " from fs_store_after_sales_scrm s " +
             " INNER join fs_store_order_scrm o on o.order_code=s.order_code " +
             " left join fs_user u on s.user_id=u.user_id " +
             " left join company c on c.company_id=s.company_id " +
             " left join company_user cu on cu.user_id=s.company_user_id " +
-            " left join fs_refund_reason rr1 on s.reason_id1 = rr1.id " +
-            " left join fs_refund_reason rr2 on s.reason_id2 = rr2.id " +
             " left join fs_store_payment_scrm fsps on fsps.business_order_id = o.id and fsps.status in (-1,1) " +
             " where 1=1 " +
             "<if test =\"maps.hfOrderCode != null and  maps.hfOrderCode!='' \"> " +
@@ -166,7 +164,9 @@ public interface FsStoreAfterSalesScrmMapper
             "</script>"})
     Integer selectFsStoreAfterSalesCount(@Param("userId")long userId, @Param("salesStatus")int salesStatus);
     @Select({"<script> " +
-            "select s.*,o.delivery_status,o.delivery_id,u.phone as user_phone,c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber  from fs_store_after_sales_scrm s INNER join fs_store_order_scrm o on o.order_code=s.order_code left join fs_user u on s.user_id=u.user_id left join company c on c.company_id=s.company_id left join company_user cu on cu.user_id=s.company_user_id " +
+            "select s.*, s.reason_level1_text as reasonValue1, s.reason_level2_text as reasonValue2, " +
+            "o.delivery_status,o.delivery_id,u.phone as user_phone,c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber  " +
+            "from fs_store_after_sales_scrm s INNER join fs_store_order_scrm o on o.order_code=s.order_code left join fs_user u on s.user_id=u.user_id left join company c on c.company_id=s.company_id left join company_user cu on cu.user_id=s.company_user_id " +
             "where 1=1 " +
             "<if test = 'orderCode != null    '> " +
             "and s.order_code = #{orderCode} " +
@@ -253,14 +253,12 @@ public interface FsStoreAfterSalesScrmMapper
             "cu.phonenumber as company_usere_phonenumber,o.pay_money,o.id as orderId,o.create_time as orderCreateTime,o.user_phone," +
             "o.real_name as userName,o.item_json,o.user_address,o.pay_time as orderPayTime,o.pay_price,o.total_postage," +
             "fsps.bank_serial_no,fsps.bank_transaction_id,o.delivery_id as orderDeliveryId,o.delivery_name as orderDeliveryName,o.delivery_sn as orderDeliverySn," +
-            "o.status as orderStatus,fsps.pay_code as payCode, rr1.reason_name as reasonValue1, rr2.reason_name as reasonValue2 " +
+            "o.status as orderStatus,fsps.pay_code as payCode, s.reason_level1_text as reasonValue1, s.reason_level2_text as reasonValue2 " +
             " from fs_store_after_sales_scrm s " +
             " INNER join fs_store_order_scrm o on o.order_code=s.order_code " +
             " left join fs_user u on s.user_id=u.user_id " +
             " left join company c on c.company_id=s.company_id " +
             " left join company_user cu on cu.user_id=s.company_user_id " +
-            " left join fs_refund_reason rr1 on s.reason_id1 = rr1.id " +
-            " left join fs_refund_reason rr2 on s.reason_id2 = rr2.id " +
             " left join fs_store_payment_scrm fsps on fsps.business_order_id = o.id and fsps.status in (-1,1) " +
             " where 1=1 and s.is_del = 0  and o.status = -2 and fsps.bank_transaction_id is not null " +
             "<if test =\"maps.hfOrderCode != null and  maps.hfOrderCode!='' \"> " +
@@ -318,20 +316,15 @@ public interface FsStoreAfterSalesScrmMapper
             "</script>"})
     List<FsStoreAfterSalesVO> selectFsStoreAfterSalesListVOExport(@Param("maps") FsStoreAfterSalesScrm fsStoreAfterSales);
 
-    @Select("SELECT sas.*, rr1.reason_name AS reasonValue1, rr2.reason_name AS reasonValue2 " +
+    @Select("SELECT sas.*, sas.reason_level1_text AS reasonValue1, sas.reason_level2_text AS reasonValue2 " +
             "FROM fs_store_after_sales_scrm sas " +
-            "LEFT JOIN fs_refund_reason rr1 ON sas.reason_id1 = rr1.id " +
-            "LEFT JOIN fs_refund_reason rr2 ON sas.reason_id2 = rr2.id " +
             "WHERE sas.order_code = #{orderCode} AND sas.status = 4 AND sas.is_del = 0 LIMIT 1")
     FsStoreAfterSalesScrm selectFsStoreAfterSalesByOrderCode(@Param("orderCode") String orderCode);
 
     /**
-     * 售后详情（含一级/二级原因名称，供销售端查看）
+     * 售后详情（含一级/二级原因展示文案，来自落库字段）
      */
-    @Select("SELECT s.*, rr1.reason_name AS reasonValue1, rr2.reason_name AS reasonValue2 " +
-            "FROM fs_store_after_sales_scrm s " +
-            "LEFT JOIN fs_refund_reason rr1 ON s.reason_id1 = rr1.id " +
-            "LEFT JOIN fs_refund_reason rr2 ON s.reason_id2 = rr2.id " +
-            "WHERE s.id = #{id}")
+    @Select("SELECT s.*, s.reason_level1_text AS reasonValue1, s.reason_level2_text AS reasonValue2 " +
+            "FROM fs_store_after_sales_scrm s WHERE s.id = #{id}")
     FsStoreAfterSalesScrm selectFsStoreAfterSalesByIdForDetail(@Param("id") Long id);
 }

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

@@ -79,7 +79,7 @@ public interface FsStoreOrderItemScrmMapper
             "select i.*,o.user_id,psps.cost,o.pay_postage,o.total_num,o.status,fspcs.cate_name, o.real_name,o.user_phone,o.user_address,o.create_time,o.pay_time,o.delivery_sn,o.delivery_name,o.delivery_id, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber,o.upload_time ,CASE WHEN o.certificates IS NULL OR o.certificates = '' THEN 0 ELSE 1 END AS is_upload,p.title as package_name,cts.name as scheduleName,sp_latest.pay_money, sp_latest.bank_transaction_id as bankTransactionId, o.delivery_send_time," +
             " o.order_code, o.pay_price, o.pay_money, o.deduction_price,o.pay_delivery, o.order_type,psps.price " +
             ", CASE o.is_audit WHEN 1 THEN '是' ELSE '否' END AS isAudit " +
-            ", sas.audit_remark as auditRemark, rr1.reason_name as reasonValue1, rr2.reason_name as reasonValue2 " +
+            ", sas.audit_remark as auditRemark, sas.reason_level1_text as reasonValue1, sas.reason_level2_text as reasonValue2 " +
             " from fs_store_order_item_scrm i " +
             " left join fs_store_order_scrm o on o.id=i.order_id" +
             " left join fs_user u on o.user_id=u.user_id  " +
@@ -90,8 +90,6 @@ public interface FsStoreOrderItemScrmMapper
             " left join fs_store_product_scrm psps on i.product_id=psps.product_id " +
             " left join fs_store_product_category_scrm fspcs on fspcs.cate_id=psps.cate_id " +
             " LEFT JOIN fs_store_after_sales_scrm sas ON sas.order_code = o.order_code AND sas.status = 4 AND sas.is_del = 0" +
-            " LEFT JOIN fs_refund_reason rr1 ON sas.reason_id1 = rr1.id" +
-            " LEFT JOIN fs_refund_reason rr2 ON sas.reason_id2 = rr2.id" +
             " LEFT JOIN (" +
             " SELECT sp.*, ROW_NUMBER() OVER (PARTITION BY sp.business_code ORDER BY sp.create_time DESC) as rn" +
             " FROM fs_store_payment_scrm sp WHERE sp.business_code IS NOT NULL" +

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

@@ -193,11 +193,9 @@ public interface FsStoreOrderScrmMapper
 
     @Select({"<script> " +
             "select o.*,u.phone,u.register_code,u.register_date,u.source, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber " +
-            ", sas.audit_remark as auditRemark, sas.audit_reason_name as auditReasonName, rr1.reason_name as reasonValue1, rr2.reason_name as reasonValue2 " +
+            ", sas.audit_remark as auditRemark, sas.audit_reason_name as auditReasonName, sas.reason_level1_text as reasonValue1, sas.reason_level2_text as reasonValue2 " +
             " from fs_store_order_scrm o left join fs_user u on o.user_id=u.user_id  left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id  " +
             " LEFT JOIN fs_store_after_sales_scrm sas ON sas.order_id = o.id AND sas.status = 4 AND sas.is_del = 0" +
-            " LEFT JOIN fs_refund_reason rr1 ON sas.reason_id1 = rr1.id" +
-            " LEFT JOIN fs_refund_reason rr2 ON sas.reason_id2 = rr2.id" +
             "<if test = 'maps.productName != null and  maps.productName !=  \"\" '> " +
             "left join fs_store_order_item_scrm oi on o.id = oi.order_id "+
             "left join fs_store_product_scrm fsp on fsp.product_id = oi.product_id"+
@@ -670,7 +668,7 @@ public interface FsStoreOrderScrmMapper
     @Select({"<script> " +
             "select o.*,cts.name as scheduleName,sp_latest.pay_code as hfshh,u.nickname,u.phone,cc.push_code,cc.create_time as customer_create_time,cc.source,cc.customer_code, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber ,p.title as package_title ,CASE WHEN o.certificates IS NULL OR o.certificates = '' THEN 0 ELSE 1 END AS is_upload  " +
             ", CASE o.is_audit WHEN 1 THEN '是' ELSE '否' END AS isAudit " +
-            ", rr1.reason_name as reasonValue1, rr2.reason_name as reasonValue2, sas.audit_remark as auditRemark " +
+            ", sas.reason_level1_text as reasonValue1, sas.reason_level2_text as reasonValue2, sas.audit_remark as auditRemark " +
             " from fs_store_order_scrm o  " +
             " left JOIN fs_store_product_package_scrm p on o.package_id=p.package_id " +
             " left join fs_user u on o.user_id=u.user_id  " +
@@ -686,8 +684,6 @@ public interface FsStoreOrderScrmMapper
             "            WHERE sp.business_code IS NOT NULL\n" +
             "            ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1\n" +
             " LEFT JOIN fs_store_after_sales_scrm sas ON sas.order_code = o.order_code AND sas.status = 4 AND sas.is_del = 0 " +
-            " LEFT JOIN fs_refund_reason rr1 ON sas.reason_id1 = rr1.id " +
-            " LEFT JOIN fs_refund_reason rr2 ON sas.reason_id2 = rr2.id " +
             "where 1=1 " +
             "<if test=\"maps.bankTransactionId !=null and maps.bankTransactionId!=''\">" +
             " and sp_latest.bank_transaction_id = #{maps.bankTransactionId} " +
@@ -806,12 +802,10 @@ public interface FsStoreOrderScrmMapper
     @Select({"<script> " +
             "select o.*, " +
             "u.nickname,u.phone,cc.push_code,cc.create_time as customer_create_time,cc.source,cc.customer_code, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber ,p.title as package_title " +
-            ", sas.audit_remark as auditRemark, rr1.reason_name as reasonValue1, rr2.reason_name as reasonValue2 " +
+            ", sas.audit_remark as auditRemark, sas.reason_level1_text as reasonValue1, sas.reason_level2_text as reasonValue2 " +
             " from fs_store_order_scrm o  left JOIN fs_store_product_package_scrm p on o.package_id=p.package_id left join fs_user u on o.user_id=u.user_id  " +
             " left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id left join crm_customer cc on cc.customer_id=o.customer_id " +
             " LEFT JOIN fs_store_after_sales_scrm sas ON sas.order_id = o.id AND sas.status = 4 AND sas.is_del = 0" +
-            " LEFT JOIN fs_refund_reason rr1 ON sas.reason_id1 = rr1.id" +
-            " LEFT JOIN fs_refund_reason rr2 ON sas.reason_id2 = rr2.id" +
             "where 1=1 " +
             "<if test = 'maps.orderCode != null and  maps.orderCode !=\"\"    '> " +
             "and o.order_code like CONCAT('%',#{maps.orderCode},'%') " +

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

@@ -839,20 +839,25 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         storeAfterSales.setReasonId1(param.getReasonId1());
         storeAfterSales.setReasonId2(param.getReasonId2());
         storeAfterSales.setAuditRemark(param.getAuditRemark());
-        
-        // 拼接审核原因名称
-        StringBuilder auditReasonName = new StringBuilder();
+
+        FsRefundReason reason1 = null;
+        FsRefundReason reason2 = null;
         if (param.getReasonId1() != null) {
-            FsRefundReason reason1 = fsRefundReasonMapper.selectFsRefundReasonById(param.getReasonId1());
-            if (reason1 != null) {
-                auditReasonName.append(reason1.getReasonName());
-            }
+            reason1 = fsRefundReasonMapper.selectFsRefundReasonById(param.getReasonId1());
         }
         if (param.getReasonId2() != null) {
-            FsRefundReason reason2 = fsRefundReasonMapper.selectFsRefundReasonById(param.getReasonId2());
-            if (reason2 != null) {
-                auditReasonName.append("：").append(reason2.getReasonName());
-            }
+            reason2 = fsRefundReasonMapper.selectFsRefundReasonById(param.getReasonId2());
+        }
+        storeAfterSales.setReasonLevel1Text(reason1 != null ? reason1.getReasonName() : null);
+        storeAfterSales.setReasonLevel2Text(reason2 != null ? reason2.getReasonName() : null);
+
+        // 拼接审核原因名称
+        StringBuilder auditReasonName = new StringBuilder();
+        if (reason1 != null) {
+            auditReasonName.append(reason1.getReasonName());
+        }
+        if (reason2 != null) {
+            auditReasonName.append("：").append(reason2.getReasonName());
         }
         storeAfterSales.setAuditReasonName(auditReasonName.toString());
         

fs-service/src/main/resources/application-config-druid-bjzm-test.yml

@@ -94,6 +94,8 @@ cloud_host:
   volcengineUrl: https://bjzmvolcengine.ylrztop.com
 headerImg:
   imgUrl:
+  download_poster_url: https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/security/2c47e4f105b641b4a49df50a77338e32.png
+
 
 ipad:
   ipadUrl: http://ipad.cdwjyyh.com

fs-service/src/main/resources/application-config-druid-bjzm.yml

@@ -89,6 +89,8 @@ cloud_host:
   volcengineUrl: https://bjzmvolcengine.ylrztop.com
 headerImg:
   imgUrl:
+  download_poster_url: https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/security/2c47e4f105b641b4a49df50a77338e32.png
+
 
 ipad:
   ipadUrl: http://aipad.klbycp.com

fs-service/src/main/resources/mapper/hisStore/FsStoreAfterSalesScrmMapper.xml

@@ -30,12 +30,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="packageJson"    column="package_json"    />
         <result property="reasonId1"    column="reason_id1"    />
         <result property="reasonId2"    column="reason_id2"    />
+        <result property="reasonLevel1Text"    column="reason_level1_text"    />
+        <result property="reasonLevel2Text"    column="reason_level2_text"    />
         <result property="auditRemark"    column="audit_remark"    />
         <result property="auditReasonName"    column="audit_reason_name"    />
     </resultMap>
 
     <sql id="selectFsStoreAfterSalesVo">
-        select id, order_code, refund_amount, service_type, reasons, explains, explain_img, shipper_code, delivery_sn, delivery_name, status, sales_status ,order_status, create_time, is_del, user_id, consignee, phone_number, address,company_id,company_user_id,is_package,package_json,reason_id1,reason_id2,audit_remark,audit_reason_name from fs_store_after_sales_scrm
+        select id, order_code, refund_amount, service_type, reasons, explains, explain_img, shipper_code, delivery_sn, delivery_name, status, sales_status ,order_status, create_time, is_del, user_id, consignee, phone_number, address,company_id,company_user_id,is_package,package_json,reason_id1,reason_id2,reason_level1_text,reason_level2_text,audit_remark,audit_reason_name from fs_store_after_sales_scrm
     </sql>
 
     <select id="selectFsStoreAfterSalesList" parameterType="FsStoreAfterSalesScrm" resultMap="FsStoreAfterSalesResult">
@@ -95,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageJson != null">package_json,</if>
             <if test="reasonId1 != null">reason_id1,</if>
             <if test="reasonId2 != null">reason_id2,</if>
+            <if test="reasonLevel1Text != null">reason_level1_text,</if>
+            <if test="reasonLevel2Text != null">reason_level2_text,</if>
             <if test="auditRemark != null">audit_remark,</if>
             <if test="auditReasonName != null">audit_reason_name,</if>
          </trim>
@@ -123,6 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageJson != null">#{packageJson},</if>
             <if test="reasonId1 != null">#{reasonId1},</if>
             <if test="reasonId2 != null">#{reasonId2},</if>
+            <if test="reasonLevel1Text != null">#{reasonLevel1Text},</if>
+            <if test="reasonLevel2Text != null">#{reasonLevel2Text},</if>
             <if test="auditRemark != null">#{auditRemark},</if>
             <if test="auditReasonName != null">#{auditReasonName},</if>
          </trim>
@@ -155,6 +161,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageJson != null">package_json = #{packageJson},</if>
             <if test="reasonId1 != null">reason_id1 = #{reasonId1},</if>
             <if test="reasonId2 != null">reason_id2 = #{reasonId2},</if>
+            <if test="reasonLevel1Text != null">reason_level1_text = #{reasonLevel1Text},</if>
+            <if test="reasonLevel2Text != null">reason_level2_text = #{reasonLevel2Text},</if>
             <if test="auditRemark != null">audit_remark = #{auditRemark},</if>
             <if test="auditReasonName != null">audit_reason_name = #{auditReasonName},</if>
         </trim>

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1858,15 +1858,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select DISTINCT o.id,o.order_code,o.extend_order_id,o.pay_order_id,o.bank_order_id,o.user_id,o.real_name,o.user_phone,o.user_address,o.cart_id,o.freight_price,o.total_num,o.total_price,o.total_postage,o.pay_price,o.pay_postage,o.pay_delivery,o.pay_money,o.deduction_price,o.coupon_id,o.coupon_price,o.paid,o.pay_time,o.pay_type,o.create_time,o.update_time,o.status,o.refund_status,o.refund_reason_wap_img,o.refund_reason_wap_explain,o.refund_reason_time,o.refund_reason_wap,o.refund_reason,o.refund_price,o.delivery_sn,o.delivery_name,o.delivery_type,o.delivery_id,o.gain_integral,o.use_integral,o.pay_integral,o.back_integral,o.mark,o.is_del,o.remark,o.verify_code,o.store_id,o.shipping_type,o.is_channel,o.is_remind,o.is_sys_del,o.is_prescribe,o.prescribe_id,o.company_id,o.company_user_id,o.is_package,o.package_json,o.order_type,o.package_id,o.finish_time,o.delivery_status,o.delivery_pay_status,o.delivery_time,o.delivery_pay_time,o.delivery_pay_money,o.tui_money,o.tui_money_status,o.delivery_import_time,o.tui_user_id,o.tui_user_money_status,o.order_create_type,o.store_house_code,o.dept_id,o.is_edit_money,o.customer_id,o.is_pay_remain,o.delivery_send_time,o.certificates,o.upload_time,o.item_json,o.schedule_id,o.delivery_pay_type,o.order_visit,o.service_fee,o.cycle,o.prescribe_price,o.follow_doctor_id,o.follow_time,o.user_coupon_id,o.order_medium,o.erp_phone,o.order_type
         ,u.phone,u.register_code,u.register_date,u.source, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber
         , csc.name miniProgramName,fsp.cost, fspc.cate_name,spavs.bar_code, sp_latest.bank_transaction_id as bankTransactionId,sp_latest.app_id, o.is_audit, o.audit_time,u.nick_name AS userNickName,oi.json_info
-        , rr1.reason_name as reasonValue1, rr2.reason_name as reasonValue2
+        , aft.reason_level1_text as reasonValue1, aft.reason_level2_text as reasonValue2
         , aft.audit_remark as auditRemark, aft.audit_reason_name as auditReasonName
         from fs_store_order_scrm o
         left join fs_user u on o.user_id=u.user_id
         left join company c on c.company_id=o.company_id
         left join company_user cu on cu.user_id=o.company_user_id
         LEFT JOIN fs_store_after_sales_scrm aft ON aft.order_code = o.order_code AND aft.status = 4
-        LEFT JOIN fs_refund_reason rr1 ON aft.reason_id1 = rr1.id
-        LEFT JOIN fs_refund_reason rr2 ON aft.reason_id2 = rr2.id
         <if test="maps.erpAccount != null and maps.erpAccount != ''">
             LEFT JOIN fs_store_order_df df on df.order_id=o.id