1.好友欢迎语 2.查询授权红包详情

fs-qw-api/src/main/java/com/fs/app/service/QwDataCallbackService.java

@@ -223,6 +223,7 @@ public class QwDataCallbackService {
                                     String qwApiExternal = redisCache.getCacheObject(cacheKey);
                                     if (StringUtil.strIsNullOrEmpty(qwApiExternal)) {
                                         try {
+                                            log.error("======进入到新增用户====");
                                             // 5. 新增用户
                                             qwExternalContactService.insertQwExternalContactByExternalUserId(root.getElementsByTagName("ExternalUserID").item(0).getTextContent(),root.getElementsByTagName("UserID").item(0).getTextContent(),null,corpId,State,WelcomeCode);
                                             // 6. 业务逻辑执行成功后，写入 Redis 缓存（有效期 10 分钟）

fs-service/src/main/java/com/fs/qw/service/IRedPacketService.java

@@ -2,6 +2,7 @@ package com.fs.qw.service;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.common.core.domain.R;
 import com.fs.qw.domain.RedPacket;
 
 /**
@@ -58,4 +59,10 @@ public interface IRedPacketService extends IService<RedPacket>{
      * @return 结果
      */
     int deleteRedPacketById(Long id);
+
+    /**
+     * 获取授权红包信息
+     * @param recordId 记录id
+     */
+    R getPhoneRedPacketInfo(Long recordId);
 }

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

@@ -2228,7 +2228,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
 
     @Override
     public void insertQwExternalContactByExternalUserId(String externalUserID, String userID, Long companyId, String corpId, String state, String welcomeCode) throws ParseException {
-
+        log.error("添加客户参数===>externalUserID:{},userId:{},companyId:{},corpId:{},state:{},welcomeCode:{}",externalUserID,userID,companyId,corpId,state,welcomeCode);
         // 获取当前日期（只包含年月日）
         LocalDate currentDate = LocalDate.now();
         // 获取当前系统时间 (HH:mm)
@@ -2326,7 +2326,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                 }
             }
         }
-
+        log.error("欢迎语====>isSend:{},welcomeCode:{}",isSend,welcomeCode);
         if (isSend && welcomeCode != null && welcomeCode != "") {
             if (qwUser != null) {
                 // 查询成员的欢迎语以及欢迎图片
@@ -3694,6 +3694,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         QwCompany qwCompany = iQwCompanyService.getQwCompanyByRedis(corpId);
 
         attachments.forEach(att -> {
+            log.error("att=====》{}",att);
             // 生成短链的条件判断
             if ("link".equals(att.getMsgtype())
                     && !StringUtil.strIsNullOrEmpty(att.getLink().getCourseId())

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

@@ -1,8 +1,16 @@
 package com.fs.qw.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.his.service.IFsUserService;
+import com.fs.qw.domain.BindPhoneRedPacketRecord;
+import com.fs.qw.service.IBindPhoneRedPacketRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.qw.mapper.RedPacketMapper;
@@ -18,6 +26,15 @@ import com.fs.qw.service.IRedPacketService;
 @Service
 public class RedPacketServiceImpl extends ServiceImpl<RedPacketMapper, RedPacket> implements IRedPacketService {
 
+    @Autowired
+    private RedPacketMapper redPacketMapper;
+
+    @Autowired
+    private IBindPhoneRedPacketRecordService bindPhoneRedPacketRecordService;
+
+    @Autowired
+    private IFsUserService userService;
+
     /**
      * 查询授权手机号红包配置
      * 
@@ -91,4 +108,17 @@ public class RedPacketServiceImpl extends ServiceImpl<RedPacketMapper, RedPacket
     {
         return baseMapper.deleteRedPacketById(id);
     }
+
+    @Override
+    public R getPhoneRedPacketInfo(Long recordId) {
+        BindPhoneRedPacketRecord record = bindPhoneRedPacketRecordService.selectBindPhoneRedPacketRecordById(recordId);
+        if (ObjectUtil.isNull(record)) {
+            return R.error().put("msg","未找到授权红包信息");
+        }
+        Map<String,Object> map = new HashMap<>();
+        //红包只有3种状态 0-已发放 1-已领取 3-待发放
+        map.put("collectType",record.getCollectType());
+        map.put("amount",record.getAmount());
+        return R.ok().put("data",map);
+    }
 }

fs-service/src/main/java/com/fs/qwApi/param/SendWelcomeMsgParam.java

@@ -27,7 +27,7 @@ public class SendWelcomeMsgParam {
         // 内部类，用于图片附件
         public static class RedPacketAttachment {
             private Long id; // 授权手机号红包id
-            private Long name; // 授权手机号红包名称
+            private String name; // 授权手机号红包名称
         }
         @Data
         // 内部类，用于图片附件

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -1482,6 +1482,14 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                     }
 
                     break;
+                case "14":
+                    //授权红包
+                    linkByMiniApp = createActivityLinkByMiniApp(st,sopLogs, param.getCorpId(), dataTime, param.getCourseId(), param.getVideoId(),
+                            String.valueOf(qwUser.getId()), companyUserId, companyId,  config,null);
+                    st.setMiniprogramAppid(qwCompany.getMiniAppId());
+                    st.setMiniprogramTitle("手机授权");
+                    st.setMiniprogramPage(linkByMiniApp);
+                    break;
 
                 case "21":
                     if (sopLogs.getFsUserId() != null && !Long.valueOf(0L).equals(sopLogs.getFsUserId())) {

fs-user-app/src/main/java/com/fs/app/controller/RedPacketController.java

@@ -0,0 +1,32 @@
+package com.fs.app.controller;
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.R;
+import com.fs.qw.service.IRedPacketService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Api("授权红包接口")
+@RestController
+@RequestMapping(value="/app/packet")
+public class RedPacketController extends BaseController {
+
+    @Autowired
+    private IRedPacketService redPacketService;
+
+
+    @ApiOperation("获取授权红包详情信息")
+    @GetMapping("/getPhoneRedPacketInfo")
+    public R getPhoneRedPacketInfo(@RequestParam("recordId")Long recordId, HttpServletRequest request) {
+        return redPacketService.getPhoneRedPacketInfo(recordId);
+    }
+
+
+}