门店地址

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

@@ -15,7 +15,6 @@ import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.service.dao.mapper.hm.HmLinkStoreMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHmLinkStore;
-import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
 
 @Service("hmLinkStoreService")

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

@@ -67,9 +67,7 @@ public class HmQrcodeTempServiceImpl implements HmQrcodeTempService {
             String configId = item.getWxConfigId();
             QywxResponseDTO resp = this.qywxUserApiService.delContactWay(corpid, suiteId, configId);
             log.info("删除临时活码={}{},返回={}", configId, corpid, JSON.toJSONString(resp));
-            if(resp.getErrcode()==0) {
-                this.hmQrcodeTempMapper.deleteByPrimaryKey(item.getId());
-            }
+            this.hmQrcodeTempMapper.deleteByPrimaryKey(item.getId());
         } catch (Exception e) {
             log.info("删除临时活码异常={}", e);
         }

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service.out.impl.hm;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.stream.Collectors;
 
@@ -24,6 +25,8 @@ import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.DingUtils;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
@@ -93,6 +96,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     private MemberClerkApiService memberClerkApiService;
     @Autowired
     private HmPageService hmPageService ;
+    @Autowired
+    private StoreService storeService ;
 
     @Override
     public ServiceResponse<String> getHmLinkUrl() {
@@ -311,6 +316,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 // 活码的门店
                 List<HmLinkStoreDTO> storeList = this.hmLinkStoreService.listByLinkId(wxEnterpriseId, enterpriseId,
                         linkId);
+                this.setStoreAddress(enterpriseId , storeList);
                 log.info("门店规则={},推荐门店列表={}", storeType, JSON.toJSONString(storeList));
                 HmLinkStoreSettingDTO cityStore = storeRuleObj.getObject("city_store", HmLinkStoreSettingDTO.class);
                 // 是否开启省市区门店查询
@@ -362,6 +368,24 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         return ServiceResponse.success(retDTO);
     }
 
+    
+    private void setStoreAddress(String enterpriseId ,List<HmLinkStoreDTO> storeList) {
+        if(CollectionUtils.isNotEmpty(storeList)) {
+            List<String> storeIdList = storeList.stream().map(dto->dto.getStoreId()).collect(Collectors.toList()) ;
+            String[] storeIds = new String[storeIdList.size()] ;
+            for(int i=0;i<storeIdList.size();i++) {
+                storeIds[i] = storeIdList.get(i) ;
+            }
+            List<StoreDTO> dtoList = this.storeService.getStores(storeIds) ;
+            Map<String,StoreDTO> map = dtoList.stream().collect(Collectors.toMap(StoreDTO::getStoreId, dto->dto,(k1, k2) -> k1));
+            storeList.forEach(item->{
+                if(null != map.get(item.getStoreId())) {
+                    item.setStoreAddress(map.get(item.getStoreId()).getStoreAddress());
+                }
+            });
+        }
+    }
+    
     private List<MemberStoreClerkDataDTO> sortMemberClerk(String enterpriseId, String memberId,
             List<MemberStoreClerkDataDTO> list) {
         ServiceResponse<List<MemberClerkDTO>> resp = this.memberClerkApiService.getMemberMainClerkList(enterpriseId,

haoban-manage3-service/src/main/resources/mapper/hm/HmQrcodeTempMapper.xml

@@ -14,6 +14,7 @@
 		<result column="corpid" property="corpid"/>
 	</resultMap>
 	<sql id="Base_Column_List">
+		id,
 		wx_config_id,
 		wx_qrcode,
 		wx_enterprise_id, corpid ,