群活码-链接调整

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkStoreDTO.java

@@ -31,8 +31,17 @@ public class HmLinkStoreDTO implements Serializable {
     private java.util.Date createTime;
     private java.util.Date updateTime;
 
+    private double distance ;
     private String distanceStr ;
 
+    public double getDistance() {
+        return distance;
+    }
+
+    public void setDistance(double distance) {
+        this.distance = distance;
+    }
+
     public String getDistanceStr() {
         return distanceStr;
     }

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

 package com.gic.haoban.manage.service.service.out.impl.hm;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.map.MapUtil;
@@ -272,6 +270,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                                     HmLinkStoreDTO storeDTO = EntityUtil.changeEntityByJSON(HmLinkStoreDTO.class, store) ;
                                     return storeDTO;
                                 }).collect(Collectors.toList()) ;
+                                this.handleStoreList(storeList) ;
                                 retDTO.setStoreList(storeList);
                                 return ServiceResponse.success(retDTO);
                             }
@@ -308,6 +307,28 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         return ServiceResponse.success(retDTO);
     }
 
+    private void handleStoreList(List<HmLinkStoreDTO> storeList) {
+        if (storeList == null) {
+            return;
+        }
+        /* 处理返回信息，营业时间和距离说明问题 */
+        for (HmLinkStoreDTO tabStore : storeList) {
+            double distance = tabStore.getDistance();
+            String distanceStr = "";
+            if (distance > 0) {
+
+                if (distance > 1000) {
+                    BigDecimal b1 = new BigDecimal(distance / 1000);
+                    distanceStr += b1.setScale(1, RoundingMode.HALF_UP) + "km";
+                } else {
+                    BigDecimal b1 = new BigDecimal(distance);
+                    distanceStr += b1.setScale(0, RoundingMode.HALF_UP) + "m";
+                }
+            }
+            tabStore.setDistanceStr(distanceStr);
+        }
+    }
+
     @Override
     public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, Integer whitchStore, String storeId, String clerkId, String linkShortCode, String mixPhone, String unionid, String memberId) {
         return this.getLinkHmFromWxa(enterpriseId, whitchStore, storeId, clerkId, linkShortCode, mixPhone, unionid, memberId, new LinkHmFromWxaQDTO());