物流信息携带套餐展示名称

fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java

@@ -90,7 +90,7 @@ public class QwMsgController {
         if(isSend == null){
             redisCache.setCacheObject("fs:express:info:send:" +orderId, "1",2, TimeUnit.MINUTES);
             FsStoreOrder order = fsStoreOrderService.selectFsStoreOrderByOrderId(orderId);
-            FsPackage fsPackage = fsPackageMapper.selectFsPackage(orderId);
+            FsPackage fsPackage = fsPackageMapper.selectFsPackageByPackageId(order.getPackageId());
             if(order != null && order.getUserId() != null){
                 List<QwExternalContact> qwExternalContact = externalContactService.selectQwExternalContactByFsUserIdAndCompany(order.getUserId(),order.getCompanyUserId());
                 if(qwExternalContact != null && !qwExternalContact.isEmpty()){

fs-service/src/main/java/com/fs/fastGpt/service/impl/AiHookServiceImpl.java

@@ -765,7 +765,7 @@ public class AiHookServiceImpl implements AiHookService {
                 List<FsStoreOrder> fsStoreOrderList = storeOrderService.selectFsStoreOrderByFsUserId(fsUserId);
                 if(fsStoreOrderList != null && !fsStoreOrderList.isEmpty()){
                     for (FsStoreOrder fsStoreOrder : fsStoreOrderList) {
-                        FsPackage fsPackage = fsPackageMapper.selectFsPackage(fsStoreOrder.getOrderId());
+                        FsPackage fsPackage = fsPackageMapper.selectFsPackageByPackageId(fsStoreOrder.getPackageId());
                         if(sBuilder.length() > 0 && fsStoreOrder.getStatus() > 1){
                             sBuilder.append("\n\n同时，");
                         }else if(fsStoreOrder.getStatus() > 1){

fs-service/src/main/java/com/fs/his/mapper/FsPackageMapper.java

@@ -28,7 +28,6 @@ public interface FsPackageMapper
      */
     public FsPackage selectFsPackageByPackageId(Long packageId);
 
-    public FsPackage selectFsPackage(@Param("orderId") Long orderId);
 
     /**
      * 查询套餐包列表

fs-service/src/main/resources/mapper/his/FsPackageMapper.xml

@@ -72,12 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where package_id = #{packageId}
     </select>
 
-    <select id="selectFsPackage" parameterType="Long" resultMap="FsPackageResult">
-        select fp.*
-        from fs_package fp
-        join fs_store_order fso on fp.package_id = fso.package_id
-        where fso.order_id = #{orderId}
-    </select>
 
     <select id="selectIcdNameByPackageId" resultType="java.lang.String">
         SELECT i.icd_name