Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WelcomeRelationServiceImpl.java

@@ -62,7 +62,7 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
     public HmWelcomeRelationBO queryWelcomeRelation(String referId, Integer status) {
         String welcomeRelationCacheKey = WELCOME_RELATION_KEY + referId;
         HmWelcomeRelationBO cache = RedisUtil.getCache(welcomeRelationCacheKey, HmWelcomeRelationBO.class);
-        if (cache != null){
+        if (cache != null) {
             return cache;
         }
         List<TabHaobanWelcomeTemplateRelation> welcomeTemplateRelations = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, status);
@@ -133,6 +133,13 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
     @Transactional(rollbackFor = RuntimeException.class)
     public Boolean saveHmWelcomeRelation(HmWelcomeRelationBO hmWelcomeRelationBO) {
         log.info("[saveHmWelcomeRelation] params:{}", JSON.toJSONString(hmWelcomeRelationBO));
+        if (StringUtils.isAnyBlank(hmWelcomeRelationBO.getWelcomeId(), hmWelcomeRelationBO.getReferId(),
+                hmWelcomeRelationBO.getEnterpriseId(), hmWelcomeRelationBO.getWxEnterpriseId(), hmWelcomeRelationBO.getReferName())) {
+            return Boolean.FALSE;
+        }
+        if (hmWelcomeRelationBO.getType() == null) {
+            return Boolean.FALSE;
+        }
         TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = new TabHaobanWelcomeTemplateRelation();
         welcomeTemplateRelation.setRelationId(UniqueIdUtils.uniqueLong());
         welcomeTemplateRelation.setEnterpriseId(hmWelcomeRelationBO.getEnterpriseId());
@@ -152,7 +159,7 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
     /**
      * 删除关联关系
      *
-     * @param    hmWelcomeRelationBO
+     * @param hmWelcomeRelationBO
      * @return
      */
     @Override
@@ -162,22 +169,25 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
         // 取消该referId已有的引用
         List<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations =
                 welcomeTemplateRelationMapper.queryWelTemplateRelation(null, hmWelcomeRelationBO.getReferId(), WelcomeRelationStatusEnum.ENABLE.getCode());
-        TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = tabHaobanWelcomeTemplateRelations.get(0);
-        if (StringUtils.equals(welcomeTemplateRelation.getReferId(), hmWelcomeRelationBO.getReferId())){
-            return Boolean.TRUE;
+        if (CollectionUtils.isNotEmpty(tabHaobanWelcomeTemplateRelations)) {
+            TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = tabHaobanWelcomeTemplateRelations.get(0);
+            if (StringUtils.equals(welcomeTemplateRelation.getWelcomeId(), hmWelcomeRelationBO.getWelcomeId())) {
+                return Boolean.TRUE;
+            }
+            welcomeTemplateRelation.setUpdateTime(new Date());
+            welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.DISABLE.getCode());
+            welcomeTemplateRelationMapper.updateByPrimaryKeySelective(welcomeTemplateRelation);
+
+            // 定义
+            this.removeWelcomeRelationCache(welcomeTemplateRelation.getReferId());
         }
-        welcomeTemplateRelation.setUpdateTime(new Date());
-        welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
-        welcomeTemplateRelationMapper.updateByPrimaryKeySelective(welcomeTemplateRelation);
-        // 定义
-        this.removeWelcomeRelationCache(welcomeTemplateRelation.getReferId());
-        if (StringUtils.isNotBlank(welcomeTemplateRelation.getWelcomeId())) {
+        if (StringUtils.isNotBlank(hmWelcomeRelationBO.getWelcomeId())) {
             return this.saveHmWelcomeRelation(hmWelcomeRelationBO);
         }
         return Boolean.TRUE;
     }
 
-    private void removeWelcomeRelationCache(String referId){
+    private void removeWelcomeRelationCache(String referId) {
         String welcomeRelationCacheKey = WELCOME_RELATION_KEY + referId;
         RedisUtil.delCache(welcomeRelationCacheKey);
     }

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

@@ -142,7 +142,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         int saveResult = hmQrcodeService.insert(hmQrcodeQDTO);
         if (saveResult == 1) {
             // save welcome relation
-            this.saveWelcomeRelation(hmQrcodeQDTO);
+            this.updateWelcomeRelation(hmQrcodeQDTO);
         }
         setLoggerContext(hmQrcodeQDTO.getEnterpriseId(), wxEnterpriseId, hmQrcodeQDTO.getCreatorId(), hmQrcodeQDTO.getCreatorName());
         GicLogRecordEvaluationContext.putAttribute("logContent", "【" + hmId + "-" + hmQrcodeQDTO.getName() + "】");

haoban-manage3-service/src/test/java/HmPageServiceTest.java

@@ -8,9 +8,12 @@ import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
+import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.api.service.hm.HmGroupApiService;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
+import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,4 +72,33 @@ public class HmPageServiceTest {
         System.out.println(JSON.toJSONString(pageServiceResponse));
     }
 
+
+    @Autowired
+    private WelcomeRelationService welcomeRelationService;
+
+    @Test
+    public void saveWelcomeRelation(){
+        HmWelcomeRelationBO welcomeRelationBo = new HmWelcomeRelationBO();
+        welcomeRelationBo.setEnterpriseId("1231321312312");
+        welcomeRelationBo.setWxEnterpriseId("31312312312");
+        welcomeRelationBo.setReferId("313131");
+        welcomeRelationBo.setReferCode("HM1312312312");
+        welcomeRelationBo.setReferName("活码名称");
+        welcomeRelationBo.setType(HmWelcomeReferType.HM.getCode());
+        welcomeRelationService.saveHmWelcomeRelation(welcomeRelationBo);
+    }
+
+
+    @Test
+    public void updateWelcomeRelationTest(){
+        HmWelcomeRelationBO welcomeRelationBo = new HmWelcomeRelationBO();
+        welcomeRelationBo.setEnterpriseId("1231321312312");
+        welcomeRelationBo.setWxEnterpriseId("31312312312");
+        welcomeRelationBo.setReferId("313131");
+        welcomeRelationBo.setReferCode("HM1312312dada");
+        welcomeRelationBo.setReferName("活码名称");
+        welcomeRelationBo.setType(HmWelcomeReferType.HM.getCode());
+        welcomeRelationService.updateWelcomeRelation(welcomeRelationBo);
+    }
+
 }