Merge remote-tracking branch 'origin/v0.1' into v0.1

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/WechatFoodIndexController.java

@@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 外卖美食主页接口。
@@ -229,6 +230,9 @@ public class WechatFoodIndexController {
 
             @Override
             public int compare(WechatBestNewShopVo o1, WechatBestNewShopVo o2) {
+                if (Objects.isNull(o2.getTotalSales()) || Objects.isNull(o1.getTotalSales())) {
+                    return 1;
+                }
                 return o2.getTotalSales().compareTo(o1.getTotalSales());
             }
         });

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/vo/shopfood/WechatSelectShopVo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -83,7 +84,21 @@ public class WechatSelectShopVo {
      */
     @Schema(description = "工作时间段(例:8:00-19:00)")
     private String workTime;
+    /**
+     * 经度。
+     */
+    @Schema(description = "经度")
+    private BigDecimal longitude;
 
-
+    /**
+     * 纬度。
+     */
+    @Schema(description = "纬度")
+    private BigDecimal latitude;
+    /**
+     * 销量。
+     */
+    @Schema(description = "销量")
+    private Long totalSales;
 
 }

application-webadmin/src/main/java/com/tourism/webadmin/back/model/DeliveryOrder.java

@@ -48,7 +48,7 @@ public class DeliveryOrder extends BaseModel {
     /**
      * 收货电话。
      */
-    @MaskField(maskType = MaskFieldTypeEnum.MOBILE_PHONE)
+//    @MaskField(maskType = MaskFieldTypeEnum.MOBILE_PHONE)
     @TableField(value = "delivery_phone")
     private String deliveryPhone;
 

application-webadmin/src/main/java/com/tourism/webadmin/back/vo/DeliveryOrderVo.java

@@ -1,5 +1,6 @@
 package com.tourism.webadmin.back.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.tourism.common.core.base.vo.BaseVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -145,4 +146,5 @@ public class DeliveryOrderVo extends BaseVo {
      */
     @Schema(description = "refundStatus 全局字典关联数据")
     private Map<String, Object> refundStatusDictMap;
+
 }