trade：新增是否自提的配置项

YunaiV
1 parent fdb10aec
Showing 12 changed files with 100 additions and 42 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/NumberUtils.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/TradeConfigController.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigRespVO.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/AppTradeConfigController.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/vo/AppTradeConfigRespVO.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverPickUpStoreController.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/vo/pickup/AppDeliveryPickUpStoreRespVO.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryPickUpStoreConvert.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
yudao-server/src/main/resources/application-dev.yaml
yudao-server/src/main/resources/application-local.yaml
@@ -13,4 +13,28 @@ public class NumberUtils {
         return StrUtil.isNotEmpty(str) ? Long.valueOf(str) : null;
     }
+    /**
+     * 通过经纬度获取地球上两点之间的距离
+     *
+     * 参考 <<a href="https://gitee.com/dromara/hutool/blob/1caabb586b1f95aec66a21d039c5695df5e0f4c1/hutool-core/src/main/java/cn/hutool/core/util/DistanceUtil.java">DistanceUtil</a>> 实现，目前它已经被 hutool 删除
+     *
+     * @param lat1 经度1
+     * @param lng1 纬度1
+     * @param lat2 经度2
+     * @param lng2 纬度2
+     * @return 距离，单位：千米
+     */
+    public static double getDistance(double lat1, double lng1, double lat2, double lng2) {
+        double radLat1 = lat1 * Math.PI / 180.0;
+        double radLat2 = lat2 * Math.PI / 180.0;
+        double a = radLat1 - radLat2;
+        double b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+        double distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2)
+                + Math.cos(radLat1) * Math.cos(radLat2)
+                * Math.pow(Math.sin(b / 2), 2)));
+        distance = distance * 6378.137;
+        distance = Math.round(distance * 10000d) / 10000d;
+        return distance;
+    }
+
 }
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
 import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +27,9 @@ public class TradeConfigController {
     @Resource
     private TradeConfigService tradeConfigService;
+    @Value("${yudao.tencent-lbs-key}")
+    private String tencentLbsKey;
+
     @PutMapping("/save")
     @Operation(summary = "更新交易中心配置")
     @PreAuthorize("@ss.hasPermission('trade:config:save')")
@@ -39,7 +43,11 @@ public class TradeConfigController {
     @PreAuthorize("@ss.hasPermission('trade:config:query')")
     public CommonResult<TradeConfigRespVO> getConfig() {
         TradeConfigDO config = tradeConfigService.getTradeConfig();
-        return success(TradeConfigConvert.INSTANCE.convert(config));
+        TradeConfigRespVO configVO = TradeConfigConvert.INSTANCE.convert(config);
+        if (configVO != null) {
+            configVO.setTencentLbsKey(tencentLbsKey);
+        }
+        return success(configVO);
     }
 }
@@ -44,6 +44,10 @@ public class TradeConfigBaseVO {
     @PositiveOrZero(message = "全场包邮的最小金额不能是负数")
     private Integer deliveryExpressFreePrice;
+    @Schema(description = "是否开启自提", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @NotNull(message = "是否开启自提不能为空")
+    private Boolean deliveryPickUpEnabled;
+
     // ========== 分销相关 ==========
     @Schema(description = "是否启用分佣", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@@ -14,4 +14,7 @@ public class TradeConfigRespVO extends TradeConfigBaseVO {
     @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
+    @Schema(description = "腾讯地图 KEY", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    private String tencentLbsKey;
+
 }
@@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,11 +31,14 @@ public class AppTradeConfigController {
     @Resource
     private TradeConfigService tradeConfigService;
+    @Value("${yudao.tencent-lbs-key}")
+    private String tencentLbsKey;
+
     @GetMapping("/get")
     @Operation(summary = "获得交易配置")
     public CommonResult<AppTradeConfigRespVO> getTradeConfig() {
-        TradeConfigDO tradeConfig = ObjUtil.defaultIfNull(tradeConfigService.getTradeConfig(), new TradeConfigDO());
-        return success(TradeConfigConvert.INSTANCE.convert02(tradeConfig));
+        TradeConfigDO config = ObjUtil.defaultIfNull(tradeConfigService.getTradeConfig(), new TradeConfigDO());
+        return success(TradeConfigConvert.INSTANCE.convert02(config).setTencentLbsKey(tencentLbsKey));
     }
 }
@@ -3,12 +3,22 @@ package cn.iocoder.yudao.module.trade.controller.app.config.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 @Schema(description = "用户 App - 交易配置 Response VO")
 @Data
 public class AppTradeConfigRespVO {
+    @Schema(description = "腾讯地图 KEY", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    private String tencentLbsKey;
+
+    // ========== 配送相关 ==========
+
+    @Schema(description = "是否开启自提", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @NotNull(message = "是否开启自提不能为空")
+    private Boolean deliveryPickUpEnabled;
+
     // ========== 售后相关 ==========
     @Schema(description = "售后的退款理由", requiredMode = Schema.RequiredMode.REQUIRED)
 package cn.iocoder.yudao.module.trade.controller.app.delivery;
-import cn.hutool.core.util.RandomUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.trade.controller.app.delivery.vo.pickup.AppDeliveryPickUpStoreRespVO;
+import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
+import cn.iocoder.yudao.module.trade.service.delivery.DeliveryPickUpStoreService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,9 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
+import javax.annotation.Resource;
 import java.util.List;
-import java.util.Random;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -24,51 +27,29 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @Validated
 public class AppDeliverPickUpStoreController {
-    // TODO 待实现[门店自提]：如果 latitude、longitude 非空，计算经纬度，并排序。计算的库，可以使用 hutool 的 DistanceUtil 计算。
+    @Resource
+    private DeliveryPickUpStoreService deliveryPickUpStoreService;
+
     @GetMapping("/list")
     @Operation(summary = "获得自提门店列表")
+    @Parameters({
+            @Parameter(name = "latitude", description = "精度", example = "110"),
+            @Parameter(name = "longitude", description = "纬度", example = "120")
+    })
     public CommonResult<List<AppDeliveryPickUpStoreRespVO>> getDeliveryPickUpStoreList(
             @RequestParam(value = "latitude", required = false) Double latitude,
             @RequestParam(value = "longitude", required = false) Double longitude) {
-        List<AppDeliveryPickUpStoreRespVO> list = new ArrayList<>();
-        Random random = new Random();
-        for (int i = 0; i < 10; i++) {
-            AppDeliveryPickUpStoreRespVO store = new AppDeliveryPickUpStoreRespVO();
-            store.setId(random.nextLong());
-            store.setName(RandomUtil.randomString(10));
-            store.setLogo("https://www.iocoder.cn/" + (i + 1) + ".png");
-            store.setPhone("15601691300");
-            store.setAreaId(random.nextInt(100000));
-            store.setAreaName("上海-" + RandomUtil.randomString(10));
-            store.setDetailAddress("普陀区-" + RandomUtil.randomString(10));
-            store.setLatitude(random.nextDouble() * 10);
-            store.setLongitude(random.nextDouble() * 10);
-            store.setDistance(random.nextInt(1000));
-
-            list.add(store);
-        }
-
-        return success(list);
+        List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreListByStatus(
+                CommonStatusEnum.ENABLE.getStatus());
+        return success(DeliveryPickUpStoreConvert.INSTANCE.convertList(list, latitude, longitude));
     }
-    // TODO 待实现[门店自提]：
     @GetMapping("/get")
     @Operation(summary = "获得自提门店")
     @Parameter(name = "id", description = "门店编号")
     public CommonResult<AppDeliveryPickUpStoreRespVO> getOrder(@RequestParam("id") Long id) {
-        AppDeliveryPickUpStoreRespVO store = new AppDeliveryPickUpStoreRespVO();
-        Random random = new Random();
-        store.setId(random.nextLong());
-        store.setName(RandomUtil.randomString(10));
-        store.setLogo("https://www.iocoder.cn/" + (1) + ".png");
-        store.setPhone("15601691300");
-        store.setAreaId(random.nextInt(100000));
-        store.setAreaName("上海-" + RandomUtil.randomString(10));
-        store.setDetailAddress("普陀区-" + RandomUtil.randomString(10));
-        store.setLatitude(random.nextDouble() * 10);
-        store.setLongitude(random.nextDouble() * 10);
-        store.setDistance(random.nextInt(1000));
-        return success(store);
+        DeliveryPickUpStoreDO store = deliveryPickUpStoreService.getDeliveryPickUpStore(id);
+        return success(DeliveryPickUpStoreConvert.INSTANCE.convert03(store));
     }
 }
@@ -34,7 +34,7 @@ public class AppDeliveryPickUpStoreRespVO {
     @Schema(description = "经度", requiredMode = Schema.RequiredMode.REQUIRED, example = "6.99")
     private Double longitude;
-    @Schema(description = "距离，单位：米", example = "100") // 只有在用户传递了经纬度时，才进行计算
-    private Integer distance;
+    @Schema(description = "距离，单位：千米", example = "100") // 只有在用户传递了经纬度时，才进行计算
+    private Double distance;
 }
 package cn.iocoder.yudao.module.trade.convert.delivery;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreRespVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreSimpleRespVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.delivery.vo.pickup.AppDeliveryPickUpStoreRespVO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -38,4 +41,18 @@ public interface DeliveryPickUpStoreConvert {
         return AreaUtils.format(areaId);
     }
+    default List<AppDeliveryPickUpStoreRespVO> convertList(List<DeliveryPickUpStoreDO> list,
+                                                           Double latitude, Double longitude) {
+        List<AppDeliveryPickUpStoreRespVO> voList =  CollectionUtils.convertList(list, store -> {
+            AppDeliveryPickUpStoreRespVO storeVO = convert03(store);
+            if (latitude != null && longitude != null) {
+                storeVO.setDistance(NumberUtils.getDistance(latitude, longitude, storeVO.getLatitude(), storeVO.getLongitude()));
+            }
+            return storeVO;
+        });
+        return voList;
+    }
+    @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName")
+    AppDeliveryPickUpStoreRespVO convert03(DeliveryPickUpStoreDO bean);
+
 }
@@ -59,6 +59,11 @@ public class TradeConfigDO extends BaseDO {
      */
     private Integer deliveryExpressFreePrice;
+    /**
+     * 是否开启自提
+     */
+    private Boolean deliveryPickUpEnabled;
+
     // ========== 分销相关 ==========
     /**
@@ -170,6 +170,7 @@ yudao:
     order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
     refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
   demo: true # 开启演示模式
+  tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
 justauth:
   enabled: true
@@ -213,6 +213,7 @@ yudao:
   error-code: # 错误码相关配置项
     enable: false
   demo: false # 关闭演示模式
+  tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
   clean-job:
     access-retain-day: 7
     error-retain-day: 8