1.信息新增分享小程序 2.优化企微客户换绑会员

fs-company/src/main/java/com/fs/company/controller/course/FsCoursePlaySourceConfigController.java

@@ -18,6 +18,7 @@ import com.fs.course.service.IFsCoursePlaySourceConfigService;
 import com.fs.course.vo.FsCoursePlaySourceConfigVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
+import com.fs.his.vo.OptionsVO;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -51,6 +52,15 @@ public class FsCoursePlaySourceConfigController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取互医小程序下拉选项列表
+     */
+    @GetMapping("/options")
+    public AjaxResult sourceList(){
+        List<OptionsVO> optionsVOS = fsCoursePlaySourceConfigService.selectCoursePlaySourceConfigVOList();
+        return AjaxResult.success(optionsVOS);
+    }
+
     @PreAuthorize("@ss.hasPermi('course:playSourceConfig:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable Long id) {

fs-company/src/main/java/com/fs/hisStore/controller/FsUserInformationCollectionController.java

@@ -113,11 +113,11 @@ public class FsUserInformationCollectionController extends BaseController
      * 生成套餐包付款二维码
      */
     @PreAuthorize("@ss.hasPermi('hisStore:collection:WxaCodeCollectionUnLimit')")
-    @GetMapping("/getWxaCodeCollectionUnLimit/{collectionId}")
-    public R getWxaCodeCollectionUnLimit(@PathVariable("collectionId") Long orderId)
+    @GetMapping("/getWxaCodeCollectionUnLimit/{collectionId}/{appId}")
+    public R getWxaCodeCollectionUnLimit(@PathVariable("collectionId") Long collectionId,@PathVariable("appId") String appId)
     {
 
-        return fsUserInformationCollectionService.getWxaCodePackageOrderUnLimit(orderId);
+        return fsUserInformationCollectionService.getWxaCodePackageOrderUnLimit(collectionId,appId);
 
     }
 

fs-service/src/main/java/com/fs/course/mapper/FsCoursePlaySourceConfigMapper.java

@@ -3,7 +3,9 @@ package com.fs.course.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.course.domain.FsCoursePlaySourceConfig;
 import com.fs.course.vo.FsCoursePlaySourceConfigVO;
+import com.fs.his.vo.OptionsVO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -14,4 +16,7 @@ public interface FsCoursePlaySourceConfigMapper extends BaseMapper<FsCoursePlayS
      * 查询点播配置列表
      */
     List<FsCoursePlaySourceConfigVO> selectCoursePlaySourceConfigVOListByMap(@Param("params") Map<String, Object> params);
+
+    @Select("SELECT appid dict_value1, `name` dict_label FROM fs_course_play_source_config WHERE is_mall = 1 AND is_del = 0")
+    List<OptionsVO> selectCoursePlaySourceConfigVOList();
 }

fs-service/src/main/java/com/fs/course/service/IFsCoursePlaySourceConfigService.java

@@ -3,6 +3,7 @@ package com.fs.course.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.course.domain.FsCoursePlaySourceConfig;
 import com.fs.course.vo.FsCoursePlaySourceConfigVO;
+import com.fs.his.vo.OptionsVO;
 
 import java.util.List;
 import java.util.Map;
@@ -13,4 +14,6 @@ public interface IFsCoursePlaySourceConfigService extends IService<FsCoursePlayS
      * 查询点播配置列表
      */
     List<FsCoursePlaySourceConfigVO> selectCoursePlaySourceConfigVOListByMap(Map<String, Object> params);
+
+    List<OptionsVO> selectCoursePlaySourceConfigVOList();
 }

fs-service/src/main/java/com/fs/course/service/impl/FsCoursePlaySourceConfigServiceImpl.java

@@ -5,6 +5,7 @@ import com.fs.course.domain.FsCoursePlaySourceConfig;
 import com.fs.course.mapper.FsCoursePlaySourceConfigMapper;
 import com.fs.course.service.IFsCoursePlaySourceConfigService;
 import com.fs.course.vo.FsCoursePlaySourceConfigVO;
+import com.fs.his.vo.OptionsVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -24,4 +25,9 @@ public class FsCoursePlaySourceConfigServiceImpl extends ServiceImpl<FsCoursePla
     public List<FsCoursePlaySourceConfigVO> selectCoursePlaySourceConfigVOListByMap(Map<String, Object> params) {
         return baseMapper.selectCoursePlaySourceConfigVOListByMap(params);
     }
+
+    @Override
+    public List<OptionsVO> selectCoursePlaySourceConfigVOList() {
+        return baseMapper.selectCoursePlaySourceConfigVOList();
+    }
 }

fs-service/src/main/java/com/fs/his/vo/OptionsVO.java

@@ -8,4 +8,6 @@ public class OptionsVO implements Serializable {
     Long dictValue;
     String dictLabel;
     String dictImgUrl;
+    //适配字符串的
+    String dictValue1;
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsUserInformationCollectionService.java

@@ -79,7 +79,7 @@ public interface IFsUserInformationCollectionService extends IService<FsUserInfo
 
     FsUserInformationCollectionVO detail(Long id);
 
-    R getWxaCodePackageOrderUnLimit(Long collectionId);
+    R getWxaCodePackageOrderUnLimit(Long collectionId,String appId);
 
     R doctorConfirm(FsUserInformationCollection collection);
 

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

@@ -472,11 +472,12 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
     }
 
     @Override
-    public R getWxaCodePackageOrderUnLimit(Long collectionId) {
-        logger.info("生成用户信息采集二维码");
+    public R getWxaCodePackageOrderUnLimit(Long collectionId,String appId) {
+        logger.info("生成用户信息采集二维码，请求参数：{}，{}",collectionId,appId);
         FsSysConfig sysConfig = configUtil.getSysConfig();
-
-        final WxMaService wxMaService = WxMaConfiguration.getMaService(sysConfig.getAppid());
+//
+//        final WxMaService wxMaService = WxMaConfiguration.getMaService(sysConfig.getAppid());
+        final WxMaService wxMaService = WxMaConfiguration.getMaService(appId);
 
         String scene="collectionId="+ collectionId ;
         byte[] file;

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -4775,20 +4775,20 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
     @Override
     public R updateQwExternalContactBindUserId(QwExternalContact qwExternalContact) {
         //获取原有的fsUserId 查询用户采集信息
-        QwExternalContact orgData = qwExternalContactMapper.selectQwExternalContactById(qwExternalContact.getId());
+        //QwExternalContact orgData = qwExternalContactMapper.selectQwExternalContactById(qwExternalContact.getId());
         QwExternalContact c = new QwExternalContact();
         c.setId(qwExternalContact.getId());
         c.setFsUserId(qwExternalContact.getFsUserId());
 //        adHtmlClickLogService.upload(c.getState(), AdUploadType.REGISTERED, e -> c.setUploadRegisterStatus(1));
-        if (qwExternalContact.getFsUserId() != null) {
-            FsUserInformationCollection collection = fsUserInformationCollectionMapper.selectFsUserInformationCollectionByUserId(orgData.getFsUserId());
-            if (collection != null) {
-                FsUserInformationCollection map = new FsUserInformationCollection();
-                map.setId(collection.getId());
-                map.setUserId(qwExternalContact.getFsUserId());
-                fsUserInformationCollectionMapper.updateFsUserInformationCollection(map);
-            }
-        }
+//        if (qwExternalContact.getFsUserId() != null) {
+//            FsUserInformationCollection collection = fsUserInformationCollectionMapper.selectFsUserInformationCollectionByUserId(orgData.getFsUserId());
+//            if (collection != null) {
+//                FsUserInformationCollection map = new FsUserInformationCollection();
+//                map.setId(collection.getId());
+//                map.setUserId(qwExternalContact.getFsUserId());
+//                fsUserInformationCollectionMapper.updateFsUserInformationCollection(map);
+//            }
+//        }
 
         qwExternalContactMapper.updateQwExternalContact(c);