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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmLinkVisitLogApiService.java

@@ -4,6 +4,6 @@ import com.gic.api.base.commons.ServiceResponse;
 
 public interface HmLinkVisitLogApiService {
 
-    public ServiceResponse<Void> save(String unionid, Long linkId);
+    public ServiceResponse<Void> save(String enterpriseId ,String unionid, String linkShortCode);
 
 }

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

@@ -9,10 +9,10 @@ import org.springframework.stereotype.Service;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.api.dto.hm.HmLinkVisitLogDTO;
-import com.gic.haoban.manage.service.dao.mapper.hm.HmLinkMapper;
 import com.gic.haoban.manage.service.dao.mapper.hm.HmLinkVisitLogMapper;
-import com.gic.haoban.manage.service.entity.hm.TabHmLink;
 import com.gic.haoban.manage.service.entity.hm.TabHmLinkVisitLog;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
+import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.HmLinkVisitLogService;
 
 @Service("hmLinkVisitLogService")
@@ -22,21 +22,11 @@ public class HmLinkVisitLogServiceImpl implements HmLinkVisitLogService {
 
     @Autowired
     private HmLinkVisitLogMapper hmLinkVisitLogMapper;
-    @Autowired
-    private HmLinkMapper hmLinkMapper;
 
     @Override
     public void save(HmLinkVisitLogDTO dto) {
-        Long linkId = dto.getLinkId();
-        TabHmLink link = this.hmLinkMapper.selectById(linkId);
-        if (null == link) {
-            log.info("链接不存在,linkId={}", linkId);
-            return;
-        }
         TabHmLinkVisitLog entity = EntityUtil.changeEntityByJSON(TabHmLinkVisitLog.class, dto);
         entity.setCreateTime(new Date());
-        entity.setWxEnterpriseId(link.getWxEnterpriseId());
-        entity.setEnterpriseId(link.getEnterpriseId());
         entity.setLogId(UniqueIdUtils.uniqueLong());
         this.hmLinkVisitLogMapper.insert(entity);
     }

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

 package com.gic.haoban.manage.service.service.out.impl.hm;
 
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.hm.HmLinkVisitLogDTO;
 import com.gic.haoban.manage.api.service.hm.HmLinkVisitLogApiService;
+import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
+import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.HmLinkVisitLogService;
 
 @Service("hmLinkVisitLogApiService")
 public class HmLinkVisitLogApiServiceImpl implements HmLinkVisitLogApiService {
 
+    private static org.apache.logging.log4j.Logger log = LogManager.getLogger(HmLinkVisitLogApiService.class);
+    
     @Autowired
     private HmLinkVisitLogService hmLinkVisitLogService;
+    
+    @Autowired
+    private HmLinkService hmLinkService;
 
     @Override
-    public ServiceResponse<Void> save(String unionid, Long linkId) {
+    public ServiceResponse<Void> save(String enterpriseId ,String unionid, String linkShortCode) {
         HmLinkVisitLogDTO dto = new HmLinkVisitLogDTO();
-        dto.setLinkId(linkId);
+        HmLinkBO link = this.hmLinkService.getByLinkShortCode(linkShortCode);
+        if (null == link) {
+            log.info("链接不存在,linkShortCode={}", linkShortCode);
+            return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "链接不存在");
+        }
+        dto.setLinkId(link.getLinkId());
         dto.setUnionId(unionid);
+        dto.setWxEnterpriseId(link.getWxEnterpriseId());
+        dto.setEnterpriseId(enterpriseId);
         this.hmLinkVisitLogService.save(dto);
         return ServiceResponse.success();
     }

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

 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.redisson.api.RRateLimiter;
-import org.redisson.api.RateIntervalUnit;
-import org.redisson.api.RateType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -18,12 +15,13 @@ import com.gic.api.base.commons.BasePageInfo;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
 import com.gic.haoban.manage.api.service.KeyDataApiService;
 import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
 import com.gic.haoban.manage.api.service.hm.HmLinkVisitLogApiService;
+import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
 import com.gic.haoban.manage.service.util.QwFriendLimitCountUtil;
-import com.gic.redis.data.util.RedisUtil;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = { "classpath:applicationContext-conf.xml" })
@@ -39,10 +37,13 @@ public class HmLinkTest {
 
     @Autowired
     private HmLinkStoreService hmLinkStoreService;
+    @Autowired
+    private HmQrcodeApiService  hmQrcodeApiService ;
+    
     
     @Test
     public void test() throws IOException {
-        RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter("hm:limit:xx");
+        /*RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter("hm:limit:xx");
         rateLimiter.trySetRate(RateType.OVERALL, 10, 1, RateIntervalUnit.SECONDS);
         
         try {
@@ -53,8 +54,19 @@ public class HmLinkTest {
         long start = System.currentTimeMillis() ;
   for(int i=0;i<100;i++)
       System.out.println(rateLimiter.tryAcquire());
-  System.out.println("----" +  (System.currentTimeMillis() - start));
+  System.out.println("----" +  (System.currentTimeMillis() - start));*/
         
+        HmQrcodeListQDTO qdto =new HmQrcodeListQDTO();
+        qdto.setClerkSelect("1");
+        qdto.setStoreSelect("sele");
+        qdto.setHmSelect("1");
+        qdto.setHmTypeInt(1);
+        qdto.setStatusFlagInt(1);
+        qdto.setStartTime(new Date());
+        qdto.setEndTime(new Date());
+        List<String> storeids = Arrays.asList("11");
+        qdto.setStoreId(storeids);
+        this.hmQrcodeApiService.listHmIdForIndex(qdto) ;
         System.in.read();
     }
     
@@ -146,7 +158,7 @@ public class HmLinkTest {
 
     @Test
     public void test2() {
-        this.hmLinkVisitLogApiService.save("unionid", 100L);
+       //  this.hmLinkVisitLogApiService.save("unionid", 100L);
     }
 
     @Test

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -12,8 +12,6 @@ import java.util.stream.Collectors;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,7 +42,6 @@ import com.gic.haoban.manage.api.service.hm.HmPageApiService;
 import com.gic.haoban.manage.api.service.hm.WxUserAddLogApiService;
 import com.gic.haoban.manage.api.service.out.WelcomeApiService;
 import com.gic.haoban.manage.api.util.DataHttpUtil;
-import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
 import com.gic.haoban.manage.web.qo.hm.data.HmLinkChartQO;
 import com.gic.haoban.manage.web.qo.hm.data.HmLinkClerkListQO;
@@ -92,6 +89,7 @@ public class HmLinkController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         RestResponse<Object> checkResp = this.saveCheck(dto) ;
         if(!"0".equals(checkResp.getCode())) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return checkResp ;
         }
         dto.setCreatorId(loginUser.getClerkId());
@@ -118,6 +116,7 @@ public class HmLinkController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         RestResponse<Object> checkResp = this.saveCheck(dto) ;
         if(!"0".equals(checkResp.getCode())) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return checkResp ;
         }
         ServiceResponse<HmLinkDTO> resp = this.hmLinkApiService.getByLinkId(loginUser.getWxEnterpriseId(),
@@ -220,7 +219,7 @@ public class HmLinkController {
             newValue = "";
         }
         if (type == 0 && !oldValue.equals(newValue)) {
-            sb.append(title).append("「").append(oldValue).append("」变更「").append(newValue).append("」");
+            sb.append(title).append("「").append(oldValue).append("」变更为「").append(newValue).append("」");
             return sb.toString();
         }
         // 会员标签
@@ -233,7 +232,7 @@ public class HmLinkController {
             if (null != newResp) {
                 newValue = newResp.getTagName() + "-" + newResp.getTagItemName();
             }
-            sb.append(title).append("「").append(oldValue).append("」变更「").append(newValue).append("」");
+            sb.append(title).append("「").append(oldValue).append("」变更为「").append(newValue).append("」");
             return sb.toString();
         }
         // 欢迎语
@@ -345,8 +344,9 @@ public class HmLinkController {
                         addList.add(dto.getStoreName() + "(" + dto.getStoreCode() + ")");
                     }
                 }
-                tempSb.append("新增门店「").append(addList.stream().collect(Collectors.joining("、")));
-                tempSb.append("」");
+                if(CollectionUtils.isNotEmpty(addList)) {
+                    tempSb.append("新增门店「").append(addList.stream().collect(Collectors.joining("、"))).append("」");
+                }
             }
 
             if (CollectionUtils.isNotEmpty(newList)) {
@@ -357,10 +357,10 @@ public class HmLinkController {
                         delIdList.add(item.getStoreName() + "(" + item.getStoreCode() + ")");
                     }
                 }
-                tempSb.append("删除门店「").append(delIdList.stream().collect(Collectors.joining("、")));
-                tempSb.append("」");
+                if(CollectionUtils.isNotEmpty(delIdList)) {
+                    tempSb.append("删除门店「").append(delIdList.stream().collect(Collectors.joining("、"))).append("」");
+                }
             }
-
         }
         // 更新
         return tempSb.toString();