重构开放平台门店同步逻辑，支持外部指定配送费

shaofan
1 parent 66413a4f
Showing 11 changed files with 68 additions and 202 deletions
src/main/java/com/diligrp/rider/controller/OpenStoreController.java
src/main/java/com/diligrp/rider/dto/DeliveryOrderCreateDTO.java
src/main/java/com/diligrp/rider/entity/ExtStore.java
src/main/java/com/diligrp/rider/entity/Orders.java
src/main/java/com/diligrp/rider/mapper/ExtStoreMapper.java
src/main/java/com/diligrp/rider/service/ExtStoreService.java
src/main/java/com/diligrp/rider/service/MerchantService.java
src/main/java/com/diligrp/rider/service/impl/DeliveryOrderServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/ExtStoreServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/MerchantServiceImpl.java
src/main/resources/schema.sql
@@ -43,7 +43,7 @@ public class OpenStoreController {
             @RequestParam(required = false) Long cityId,
             @RequestParam(defaultValue = "1") int page) {
         String appKey = request.getHeader("X-App-Key");
-        return Result.success(merchantService.storeList(cityId, null, page));
+        return Result.success(merchantService.storeListByApp(appKey, cityId, page));
     }
     /**
 package com.diligrp.rider.dto;
+import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import java.math.BigDecimal;
@@ -29,10 +29,10 @@ public class DeliveryOrderCreateDTO {
     /** 发货门店地址 */
     private String storeAddr;
-    /** 发货门店经度（extStoreId 为空时必填） */
+    /** 发货门店经度（outStoreId 无法补齐时必填） */
     private String storeLng;
-    /** 发货门店纬度（extStoreId 为空时必填） */
+    /** 发货门店纬度（outStoreId 无法补齐时必填） */
     private String storeLat;
     /** 收件人姓名 */
@@ -59,6 +59,10 @@ public class DeliveryOrderCreateDTO {
     @NotBlank(message = "外部订单号不能为空")
     private String outOrderNo;
+    /** 外部指定配送费；不传则按系统规则计算 */
+    @DecimalMin(value = "0.00", message = "配送费不能小于0")
+    private BigDecimal deliveryFee;
+
     /** 货物重量（kg），用于重量计费，0=不计重 */
     private BigDecimal weight = BigDecimal.ZERO;
-package com.diligrp.rider.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-/**
- * 外部门店表
- * 接入方通过 API 注册/同步自己系统的门店到配送中台
- * 与 AppKey 绑定，一个应用可有多个门店
- */
-@Data
-@TableName("ext_store")
-public class ExtStore {
-
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /** 所属应用 AppKey */
-    private String appKey;
-
-    /** 接入方自己系统的门店ID（外部系统的原始ID，用于对账） */
-    private String outStoreId;
-
-    /** 门店名称 */
-    private String name;
-
-    /** 门店地址 */
-    private String address;
-
-    /** 经度 */
-    private String lng;
-
-    /** 纬度 */
-    private String lat;
-
-    /** 所属城市ID */
-    private Long cityId;
-
-    /** 门店联系电话 */
-    private String phone;
-
-    /** 营业状态：0=关闭 1=营业 */
-    private Integer status;
-
-    /** 备注 */
-    private String remark;
-
-    private Long createTime;
-
-    private Long updateTime;
-}
@@ -123,9 +123,6 @@ public class Orders {
     /** 货物整单备注（如：放门口、不要辣） */
     private String itemRemark;
-    /** 关联外部门店ID（接入方在平台注册的门店） */
-    private Long extStoreId;
-
     /** 是否删除 */
     @TableLogic
     private Integer isDel;
-package com.diligrp.rider.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diligrp.rider.entity.ExtStore;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface ExtStoreMapper extends BaseMapper<ExtStore> {
-}
-package com.diligrp.rider.service;
-
-import com.diligrp.rider.entity.ExtStore;
-
-import java.util.List;
-
-public interface ExtStoreService {
-    /** 同步门店（新增或更新，以 appKey+outStoreId 为唯一键） */
-    ExtStore syncStore(String appKey, ExtStore store);
-    /** 查询某应用下的门店列表 */
-    List<ExtStore> listByApp(String appKey);
-    /** 获取单个门店（appKey为null时不校验归属） */
-    ExtStore getById(Long id, String appKey);
-    /** 设置门店状态 */
-    void setStatus(Long id, String appKey, int status);
-    /** 删除门店 */
-    void delete(Long id, String appKey);
-    /** 平台管理端：查看所有门店（可按 appKey/cityId 过滤） */
-    List<ExtStore> listAll(String appKey, Long cityId, int page);
-}
@@ -12,6 +12,7 @@ public interface MerchantService {
     void editStore(MerchantStoreDTO dto);
     void editStore(MerchantStoreDTO dto, Long scopedCityId);
     List<MerchantStore> storeList(Long cityId, String keyword, int page);
+    List<MerchantStore> storeListByApp(String appKey, Long cityId, int page);
     MerchantStore getStore(Long storeId);
     MerchantStore getStore(Long storeId, Long scopedCityId);
     void setOperatingState(Long storeId, int state);
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
@@ -97,7 +98,10 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
         feeDTO.setWeight(dto.getWeight());
         feeDTO.setPieces(calcPieces(dto.getItems()));
         feeDTO.setServiceTime(dto.getServiceTime());
-        DeliveryFeeResultVO fee = deliveryFeeService.calcFee(feeDTO);
+        DeliveryFeeResultVO computedFee = deliveryFeeService.calcFee(feeDTO);
+        DeliveryFeeResultVO fee = dto.getDeliveryFee() != null
+                ? buildExternalFee(dto.getDeliveryFee(), computedFee)
+                : computedFee;
         // 4. 生成订单号
         String orderNo = generateOrderNo();
@@ -111,11 +115,16 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
         extra.put("weight", dto.getWeight());
         extra.put("pieces", feeDTO.getPieces());
         extra.put("remark", dto.getRemark());
+        extra.put("feeSource", dto.getDeliveryFee() != null ? "external" : "computed");
+        if (dto.getDeliveryFee() != null) {
+            extra.put("externalDeliveryFee", fee.getTotalFee());
+        }
         extra.put("computed", Map.of(
-                "money_basic", fee.getMoneyBasic(),
-                "money_distance", fee.getMoneyDistance(),
-                "money_piece", fee.getMoneyPiece(),
-                "money_time", fee.getMoneyTime()
+                "money_basic", computedFee.getMoneyBasic(),
+                "money_distance", computedFee.getMoneyDistance(),
+                "money_piece", computedFee.getMoneyPiece(),
+                "money_time", computedFee.getMoneyTime(),
+                "total_fee", computedFee.getTotalFee()
         ));
         String extraJson;
         try {
@@ -162,7 +171,6 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
             } catch (Exception ignored) {}
         }
         order.setItemRemark(dto.getItemRemark());
-        order.setExtStoreId(null); // 改为通过 outStoreId 关联，不存具体ID
         order.setRiderId(0L);
         order.setOldRiderId(0L);
         order.setIsTrans(0);
@@ -237,6 +245,24 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
         }
     }
+    private DeliveryFeeResultVO buildExternalFee(BigDecimal deliveryFee, DeliveryFeeResultVO computedFee) {
+        BigDecimal actualFee = deliveryFee.setScale(2, RoundingMode.HALF_UP);
+        DeliveryFeeResultVO feeVO = new DeliveryFeeResultVO();
+        feeVO.setMoneyBasic(actualFee);
+        feeVO.setMoneyDistance(BigDecimal.ZERO);
+        feeVO.setMoneyWeight(BigDecimal.ZERO);
+        feeVO.setMoneyPiece(BigDecimal.ZERO);
+        feeVO.setMoneyTime(BigDecimal.ZERO);
+        feeVO.setTotalFee(actualFee);
+        feeVO.setDistance(computedFee.getDistance());
+        feeVO.setEstimatedMinutes(computedFee.getEstimatedMinutes());
+        feeVO.setWeight(computedFee.getWeight());
+        feeVO.setPieces(computedFee.getPieces());
+        feeVO.setMinFee(computedFee.getMinFee());
+        feeVO.setMinFeeApplied(0);
+        return feeVO;
+    }
+
     private DeliveryFeeResultVO buildFeeVO(Orders order) {
         DeliveryFeeResultVO feeVO = new DeliveryFeeResultVO();
         feeVO.setMoneyBasic(order.getMoneyDelivery());
-package com.diligrp.rider.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.diligrp.rider.common.exception.BizException;
-import com.diligrp.rider.entity.ExtStore;
-import com.diligrp.rider.mapper.ExtStoreMapper;
-import com.diligrp.rider.service.ExtStoreService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@RequiredArgsConstructor
-public class ExtStoreServiceImpl implements ExtStoreService {
-
-    private final ExtStoreMapper extStoreMapper;
-
-    @Override
-    public ExtStore syncStore(String appKey, ExtStore store) {
-        store.setAppKey(appKey);
-        long now = System.currentTimeMillis() / 1000;
-
-        // 根据 appKey + outStoreId 判断是新增还是更新
-        ExtStore existing = extStoreMapper.selectOne(new LambdaQueryWrapper<ExtStore>()
-                .eq(ExtStore::getAppKey, appKey)
-                .eq(ExtStore::getOutStoreId, store.getOutStoreId())
-                .last("LIMIT 1"));
-
-        if (existing == null) {
-            store.setStatus(store.getStatus() != null ? store.getStatus() : 1);
-            store.setCreateTime(now);
-            store.setUpdateTime(now);
-            extStoreMapper.insert(store);
-        } else {
-            store.setId(existing.getId());
-            store.setUpdateTime(now);
-            extStoreMapper.updateById(store);
-        }
-        return extStoreMapper.selectById(store.getId());
-    }
-
-    @Override
-    public List<ExtStore> listByApp(String appKey) {
-        return extStoreMapper.selectList(new LambdaQueryWrapper<ExtStore>()
-                .eq(ExtStore::getAppKey, appKey)
-                .eq(ExtStore::getStatus, 1)
-                .orderByDesc(ExtStore::getId));
-    }
-
-    @Override
-    public ExtStore getById(Long id, String appKey) {
-        ExtStore store = extStoreMapper.selectById(id);
-        if (store == null) throw new BizException("门店不存在");
-        if (appKey != null && !appKey.equals(store.getAppKey())) throw new BizException("无权访问该门店");
-        return store;
-    }
-
-    @Override
-    public void setStatus(Long id, String appKey, int status) {
-        ExtStore store = getById(id, appKey);
-        extStoreMapper.update(null, new LambdaUpdateWrapper<ExtStore>()
-                .eq(ExtStore::getId, id)
-                .set(ExtStore::getStatus, status)
-                .set(ExtStore::getUpdateTime, System.currentTimeMillis() / 1000));
-    }
-
-    @Override
-    public void delete(Long id, String appKey) {
-        getById(id, appKey);
-        extStoreMapper.deleteById(id);
-    }
-
-    // 平台管理端：不限 appKey 查看所有门店
-    @Override
-    public List<ExtStore> listAll(String appKey, Long cityId, int page) {
-        LambdaQueryWrapper<ExtStore> wrapper = new LambdaQueryWrapper<ExtStore>()
-                .orderByDesc(ExtStore::getId);
-        if (appKey != null && !appKey.isBlank()) wrapper.eq(ExtStore::getAppKey, appKey);
-        if (cityId != null && cityId > 0) wrapper.eq(ExtStore::getCityId, cityId);
-        int offset = (page - 1) * 20;
-        wrapper.last("LIMIT " + offset + ",20");
-        return extStoreMapper.selectList(wrapper);
-    }
-}
@@ -6,10 +6,12 @@ import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.dto.MerchantStoreDTO;
 import com.diligrp.rider.entity.MerchantStore;
 import com.diligrp.rider.entity.MerchantUsers;
+import com.diligrp.rider.entity.OpenApp;
 import com.diligrp.rider.mapper.MerchantStoreMapper;
 import com.diligrp.rider.mapper.MerchantUsersMapper;
 import com.diligrp.rider.service.CityService;
 import com.diligrp.rider.service.MerchantService;
+import com.diligrp.rider.service.OpenAppService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +26,7 @@ public class MerchantServiceImpl implements MerchantService {
     private final MerchantStoreMapper storeMapper;
     private final MerchantUsersMapper usersMapper;
     private final CityService cityService;
+    private final OpenAppService openAppService;
     private static final int PAGE_SIZE = 20;
@@ -95,6 +98,21 @@ public class MerchantServiceImpl implements MerchantService {
     }
     @Override
+    public List<MerchantStore> storeListByApp(String appKey, Long cityId, int page) {
+        if (appKey == null || appKey.isBlank()) throw new BizException("AppKey不能为空");
+        LambdaQueryWrapper<MerchantStore> wrapper = new LambdaQueryWrapper<MerchantStore>()
+                .eq(MerchantStore::getAppKey, appKey)
+                .eq(MerchantStore::getIsDel, 0)
+                .orderByAsc(MerchantStore::getListOrder)
+                .orderByDesc(MerchantStore::getId);
+        if (cityId != null && cityId > 0) wrapper.eq(MerchantStore::getCityId, cityId);
+        int currentPage = Math.max(page, 1);
+        int offset = (currentPage - 1) * PAGE_SIZE;
+        wrapper.last("LIMIT " + offset + "," + PAGE_SIZE);
+        return storeMapper.selectList(wrapper);
+    }
+
+    @Override
     public MerchantStore getStore(Long storeId) {
         return getStore(storeId, null);
     }
@@ -157,7 +175,12 @@ public class MerchantServiceImpl implements MerchantService {
     public MerchantStore syncStore(String appKey, MerchantStoreDTO dto) {
         if (appKey == null || appKey.isBlank()) throw new BizException("AppKey不能为空");
         if (dto.getOutStoreId() == null || dto.getOutStoreId().isBlank()) throw new BizException("外部门店编号不能为空");
-        ensureCityExists(dto.getCityId());
+
+        OpenApp app = openAppService.getByAppKey(appKey);
+        if (app == null) throw new BizException("开放平台应用不存在");
+        if (app.getCityId() == null || app.getCityId() < 1) throw new BizException("该应用未绑定城市/租户，请联系平台管理员");
+        dto.setCityId(app.getCityId());
+        ensureCityExists(app.getCityId());
         long now = System.currentTimeMillis() / 1000;
         MerchantStore existing = getByOutStoreId(appKey, dto.getOutStoreId());
@@ -348,9 +348,11 @@ CREATE TABLE `merchant_store` (
   `list_order`       INT             NOT NULL DEFAULT 0 COMMENT '排序',
   `is_del`           TINYINT         NOT NULL DEFAULT 0 COMMENT '逻辑删除',
   `add_time`         BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `sync_app_key`     VARCHAR(32) GENERATED ALWAYS AS (NULLIF(`app_key`, '')) STORED COMMENT '外部同步唯一键AppKey',
+  `sync_out_store_id` VARCHAR(64) GENERATED ALWAYS AS (NULLIF(`out_store_id`, '')) STORED COMMENT '外部同步唯一键门店ID',
   PRIMARY KEY (`id`),
   KEY `idx_city_id` (`city_id`),
-  KEY `idx_app_out_store` (`app_key`, `out_store_id`),
+  UNIQUE KEY `uk_app_out_store` (`sync_app_key`, `sync_out_store_id`, `is_del`),
   KEY `idx_order_del` (`list_order`, `is_del`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商家店铺表';
@@ -504,30 +506,9 @@ INSERT INTO `orders_refund_reason` (`name`, `role`, `list_order`) VALUES
 ('无法完成配送', 2, 2),
 ('其他原因', 2, 99);
--- 外部门店表（接入方通过开放平台同步自己系统的门店）
-CREATE TABLE `ext_store` (
-  `id`           BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `app_key`      VARCHAR(32)     NOT NULL DEFAULT '' COMMENT '所属应用AppKey',
-  `out_store_id` VARCHAR(64)     NOT NULL DEFAULT '' COMMENT '接入方门店原始ID',
-  `name`         VARCHAR(128)    NOT NULL DEFAULT '' COMMENT '门店名称',
-  `address`      VARCHAR(255)    NOT NULL DEFAULT '' COMMENT '门店地址',
-  `lng`          VARCHAR(32)     NOT NULL DEFAULT '' COMMENT '经度',
-  `lat`          VARCHAR(32)     NOT NULL DEFAULT '' COMMENT '纬度',
-  `city_id`      BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '所属城市ID',
-  `phone`        VARCHAR(20)     NOT NULL DEFAULT '' COMMENT '联系电话',
-  `status`       TINYINT         NOT NULL DEFAULT 1 COMMENT '状态：0=关闭 1=营业',
-  `remark`       VARCHAR(255)    NOT NULL DEFAULT '' COMMENT '备注',
-  `create_time`  BIGINT UNSIGNED NOT NULL DEFAULT 0,
-  `update_time`  BIGINT UNSIGNED NOT NULL DEFAULT 0,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_app_store` (`app_key`, `out_store_id`),
-  KEY `idx_city_id` (`city_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='外部门店表';
-
 -- orders 表补充货物快照字段
 ALTER TABLE `orders` ADD COLUMN `items_json` TEXT COMMENT '货物清单快照JSON' AFTER `callback_url`;
 ALTER TABLE `orders` ADD COLUMN `item_remark` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '整单货物备注' AFTER `items_json`;
-ALTER TABLE `orders` ADD COLUMN `ext_store_id` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '关联外部门店ID' AFTER `item_remark`;
 -- orders 表补充调度字段
 ALTER TABLE `orders` ADD COLUMN `dispatch_time` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '系统派单时间' AFTER `trans_time`;