zx 1 день назад
Родитель
Сommit
159494901a

+ 2 - 2
fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -141,7 +141,7 @@ import static com.fs.course.utils.LinkUtil.generateRandomStringWithLock;
 @Slf4j
 @Component("task")
 public class Task {
-    private static final String miniappRealLink = "pages_user/answerQues?";
+    private static final String miniappRealLink = "pages_user/answerQues.html";
     //商城小程序appId配置常量
     private static final String APP_ID_CONFIG_KEY = "appStore.appId.config";
 
@@ -2830,7 +2830,7 @@ public class Task {
 
         String courseJson = JSON.toJSONString(courseMap);
 
-        String realLinkFull = miniappRealLink + courseJson;
+        String realLinkFull = miniappRealLink ;
 
 
         link.setRealLink(realLinkFull);

+ 4 - 3
fs-service/src/main/resources/mapper/his/FsUserWxMapper.xml

@@ -6,14 +6,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertOrUpdateByUniqueKey">
         insert into fs_user_wx
-            (fs_user_id, app_id, union_id, open_id, create_time, update_time)
+            (fs_user_id, app_id, union_id, open_id, create_time, update_time,type)
         values
-            (#{fsUserId}, #{appId}, #{unionId}, #{openId}, #{createTime, jdbcType=TIMESTAMP}, #{updateTime, jdbcType=TIMESTAMP})
+            (#{fsUserId}, #{appId}, #{unionId}, #{openId}, #{createTime, jdbcType=TIMESTAMP}, #{updateTime, jdbcType=TIMESTAMP}, #{type})
         ON DUPLICATE KEY UPDATE
         <if test="unionId != null">
             union_id = VALUES(union_id),
         </if>
             open_id     = VALUES(open_id),
-            update_time = VALUES(update_time)
+            update_time = VALUES(update_time),
+            `type`        = VALUES(`type`)
     </insert>
 </mapper>

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -794,7 +794,7 @@ public class AppLoginController extends AppBaseController{
         if(userWx == null){
             FsUserWx userWx1 = new FsUserWx();
             userWx1.setFsUserId(fsUser.getUserId());
-            userWx1.setAppId(appid);
+            userWx1.setAppId("wx9fff2b486e55bbde");
             userWx1.setUnionId(param.getUnionId());
             userWx1.setOpenId(param.getOpenId());
             userWx1.setType(2);