三七 1 неделя назад
Родитель
Сommit
f4c55a8266

+ 2 - 0
fs-service/src/main/java/com/fs/his/param/FsIntegralOrderDoPayParam.java

@@ -10,4 +10,6 @@ public class FsIntegralOrderDoPayParam {
     private Long orderId;
     private Long orderId;
 
 
     private Long userId;
     private Long userId;
+
+    private String appId;
 }
 }

+ 2 - 0
fs-service/src/main/java/com/fs/his/service/impl/FsIntegralOrderServiceImpl.java

@@ -652,6 +652,8 @@ public class FsIntegralOrderServiceImpl implements IFsIntegralOrderService
         }
         }
 
 
         PayOrderParam payOrderParam = buildPayOrderParam(paymentMethod, order);
         PayOrderParam payOrderParam = buildPayOrderParam(paymentMethod, order);
+        //加一个前端传来的appid
+        payOrderParam.setAppId(param.getAppId());
         return storePaymentService.processPayment(payOrderParam);
         return storePaymentService.processPayment(payOrderParam);
     }
     }
 
 

+ 1 - 1
fs-service/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -750,7 +750,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
     <select id="selectVcCompanyUserByCompanyUserId" resultType="com.fs.company.param.VcCompanyUser">
     <select id="selectVcCompanyUserByCompanyUserId" resultType="com.fs.company.param.VcCompanyUser">
         select
         select
-            id,times,speaker_id,upload_url,upload_time,company_user_id,latest_text_to_speech_url
+            id,times,speaker_id,upload_url,upload_time,company_user_id,latest_text_to_speech_url,version_id
         from
         from
             vc_company_user
             vc_company_user
         where  company_user_id = #{companyUserId}
         where  company_user_id = #{companyUserId}