feat:增加日志

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MiniprogramSettingService.java

@@ -12,11 +12,11 @@ import java.util.List;
 public interface MiniprogramSettingService {
 
     /**
-     * 保存素材
+     * 小程序保存
      *
      * @param miniprogramSetting
      */
-    public void saveMiniprogramSetting(TabMiniprogramSetting miniprogramSetting);
+    void saveMiniprogramSetting(TabMiniprogramSetting miniprogramSetting);
 
     /**
      * 小程序列表
@@ -24,7 +24,7 @@ public interface MiniprogramSettingService {
      * @param wxEnterpriseId
      * @return
      */
-    public List<TabMiniprogramSetting> listMiniprogram(String wxEnterpriseId);
+    List<TabMiniprogramSetting> listMiniprogram(String wxEnterpriseId);
 
     /**
      * 获取单个配置信息
@@ -33,7 +33,7 @@ public interface MiniprogramSettingService {
      * @param enterpriseId
      * @return
      */
-    public TabMiniprogramSetting getMiniprogramSetting(String wxEnterpriseId, String enterpriseId);
+    TabMiniprogramSetting getMiniprogramSetting(String wxEnterpriseId, String enterpriseId);
 
     /**
      * 获取单个配置信息 无需操作企业微信media
@@ -42,7 +42,7 @@ public interface MiniprogramSettingService {
      * @param enterpriseId
      * @return
      */
-    public TabMiniprogramSetting getMiniprogramSettingNoMedia(String wxEnterpriseId, String enterpriseId);
+    TabMiniprogramSetting getMiniprogramSettingNoMedia(String wxEnterpriseId, String enterpriseId);
 
     /**
      * 删除
@@ -50,7 +50,7 @@ public interface MiniprogramSettingService {
      * @param id
      * @return
      */
-    public boolean delMiniprogramSetting(String id);
+    boolean delMiniprogramSetting(String id);
 
     /**
      * 获取单个配置信息
@@ -59,7 +59,7 @@ public interface MiniprogramSettingService {
      * @param appId
      * @return
      */
-    public TabMiniprogramSetting getMiniprogramSettingByAppId(String wxEnterpriseId, String appId);
+    TabMiniprogramSetting getMiniprogramSettingByAppId(String wxEnterpriseId, String appId);
 
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -493,11 +493,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private void sendWelcome(MemberUnionidRelatedDTO dto, StaffClerkRelationDTO staffClerkRelationDTO, boolean sendApp) {
         log.info("发送欢迎语：{}", JSONObject.toJSONString(staffClerkRelationDTO));
         String relationKey = SecureUtil.md5(staffClerkRelationDTO.getClerkId() + dto.getExternalUserid());
-
-
-        TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(staffClerkRelationDTO.getWxEnterpriseId());
+        String wxEnterpriseId = staffClerkRelationDTO.getWxEnterpriseId();
+        TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(wxEnterpriseId);
         if (null == tabWelcome || tabWelcome.getOpenFlag() == 0) {
-            log.info("不用发送欢迎语：{},{}", dto.getWxEnterpriseId(), JSONObject.toJSONString(tabWelcome));
+            log.info("欢迎语未配置：{},{}", dto.getWxEnterpriseId(), JSONObject.toJSONString(tabWelcome));
             return;
         }
 
@@ -505,12 +504,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String content = tabWelcome.getWelcomeContent().replaceAll("<微信昵称>", externalName);
         QywxWelcomeMsgDTO qywxWelcomeMsgDTO = new QywxWelcomeMsgDTO();
         qywxWelcomeMsgDTO.setText(tabWelcome == null ? "欢迎您！" : content);
-        //发送小吃店哪个系
+        //发送小程序
         if (sendApp) {
+            log.info("发送小程序：{}", wxEnterpriseId);
             QywxMiniprogramExternalBaseDTO messageBaseDTO = new QywxMiniprogramExternalBaseDTO();
-            TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSetting(staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
+            TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSetting(wxEnterpriseId, staffClerkRelationDTO.getEnterpriseId());
             if (null == miniprogramSetting) {
-                log.info("需要配置小程序配置：{}", staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
+                log.info("需要配置小程序配置：wxEnterpriseId:{},enterpriseId:{}", wxEnterpriseId, staffClerkRelationDTO.getEnterpriseId());
                 return;
             }
             messageBaseDTO.setAppid(miniprogramSetting.getAppId());
@@ -522,6 +522,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         qywxWelcomeMsgDTO.setWelcomeCode(dto.getWelcomeCode());
         if (dto.getSuiteid().equals(SELF_APP)) {
+            //好办助手和代开发
             SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(dto.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
             qywxUserApiService.sendSelfWelcomeMsgByExternal(dto.getCorpid(), secretSetting.getSecretVal(), qywxWelcomeMsgDTO);
         } else {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MiniprogramSettingServiceImpl.java

@@ -9,7 +9,6 @@ import com.gic.haoban.manage.service.entity.TabMiniprogramSetting;
 import com.gic.haoban.manage.service.service.MiniprogramSettingService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.util.CommonUtil;
-import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.enums.QywxMediaTypeEnum;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import org.apache.commons.lang3.StringUtils;
@@ -78,7 +77,6 @@ public class MiniprogramSettingServiceImpl implements MiniprogramSettingService
         }
         String[] arr = miniprogramSetting.getImageUrl().split("/");
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        Date createTme = miniprogramSetting.getCreateTime();
         JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(miniprogramSetting.getImageUrl()), arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode());
         if (jp.getErrorCode() == 0) {
             miniprogramSetting.setMediaTime(date);
@@ -94,9 +92,6 @@ public class MiniprogramSettingServiceImpl implements MiniprogramSettingService
     @Override
     public TabMiniprogramSetting getMiniprogramSettingNoMedia(String wxEnterpriseId, String enterpriseId) {
         TabMiniprogramSetting miniprogramSetting = tabMiniprogramSettingMapper.getMiniprogramSetting(wxEnterpriseId, enterpriseId);
-        if (miniprogramSetting == null) {
-            return null;
-        }
         return miniprogramSetting;
     }