From 3303efa85efe8670c19ccedda97506271ceded3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=A0?= <1085577365@qq.com>
Date: Fri, 26 May 2023 12:00:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../express/ShippingTemplatesController.java  |  6 ++---
 .../ShippingTemplatesFreeController.java      |  2 +-
 ...ShippingTemplatesNoDeliveryController.java |  2 +-
 .../ShippingTemplatesRegionController.java    |  2 +-
 .../express/ShippingTemplatesDO.java          |  2 +-
 .../express/ShippingTemplatesFreeDO.java      |  4 +--
 .../ShippingTemplatesNoDeliveryDO.java        |  4 +--
 .../express/ShippingTemplatesRegionDO.java    |  4 +--
 .../express/ShippingTemplatesFreeMapper.java  |  2 +-
 .../ShippingTemplatesNoDeliveryMapper.java    |  2 +-
 .../ShippingTemplatesRegionMapper.java        |  2 +-
 .../express/ShippingTemplatesFreeService.java |  8 +++---
 .../ShippingTemplatesNoDeliveryService.java   |  8 +++---
 .../ShippingTemplatesRegionService.java       |  8 +++---
 .../express/ShippingTemplatesService.java     |  6 ++---
 .../ShippingTemplatesFreeServiceImpl.java     | 15 ++++++-----
 ...hippingTemplatesNoDeliveryServiceImpl.java |  8 +++---
 .../ShippingTemplatesRegionServiceImpl.java   | 14 +++++------
 .../impl/ShippingTemplatesServiceImpl.java    |  6 ++---
 .../service/order/impl/OrderServiceImpl.java  | 25 ++++++++++---------
 .../express/ShippingTemplatesFreeMapper.xml   |  2 +-
 .../ShippingTemplatesNoDeliveryMapper.xml     |  2 +-
 .../express/ShippingTemplatesRegionMapper.xml |  2 +-
 23 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesController.java
index 41d6eb02c..6ebf045e5 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesController.java
@@ -74,7 +74,7 @@ public class ShippingTemplatesController {
     @Operation(summary = "删除")
     @RequestMapping(value = "/delete", method = RequestMethod.GET)
     @Parameter(name="id", description="模板ID", required = true)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
+    public CommonResult<String> delete(@RequestParam(value = "id") Long id){
         if(shippingTemplatesService.remove(id)){
             return success("删除成功");
         }else{
@@ -90,7 +90,7 @@ public class ShippingTemplatesController {
     @PreAuthorize("@ss.hasPermission('admin:shipping:templates:update')")
     @Operation(summary = "修改")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @RequestBody @Validated ShippingTemplatesReqVO request){
+    public CommonResult<String> update(@RequestParam Long id, @RequestBody @Validated ShippingTemplatesReqVO request){
         if (shippingTemplatesService.update(id, request)) {
             return CommonResult.success("修改成功");
         }
@@ -105,7 +105,7 @@ public class ShippingTemplatesController {
     @Operation(summary = "详情")
     @RequestMapping(value = "/info", method = RequestMethod.GET)
     @Parameter(name="id", description="模板ID", required = true)
-    public CommonResult<ShippingTemplatesDO> info(@RequestParam(value = "id") Integer id){
+    public CommonResult<ShippingTemplatesDO> info(@RequestParam(value = "id") Long id){
         return CommonResult.success(shippingTemplatesService.getInfo(id));
    }
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesFreeController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesFreeController.java
index 7cfc4406d..b9ad6f7c9 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesFreeController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesFreeController.java
@@ -43,7 +43,7 @@ public class ShippingTemplatesFreeController {
     @PreAuthorize("@ss.hasPermission('admin:shipping:templates:free:list')")
     @Operation(summary = "根据模板id查询数据")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<List<ShippingTemplatesFreeRespVO>> getList(@RequestParam Integer tempId){
+    public CommonResult<List<ShippingTemplatesFreeRespVO>> getList(@RequestParam Long tempId){
         return CommonResult.success(shippingTemplatesFreeService.getListGroup(tempId));
     }
 
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesNoDeliveryController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesNoDeliveryController.java
index 8af8816bc..cf71141e6 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesNoDeliveryController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesNoDeliveryController.java
@@ -43,7 +43,7 @@ public class ShippingTemplatesNoDeliveryController {
     @PreAuthorize("@ss.hasPermission('admin:shipping:templates:free:list')")
     @Operation(summary = "根据模板id查询数据")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<List<ShippingTemplatesNoDeliveryRespVO>> getList(@RequestParam Integer tempId){
+    public CommonResult<List<ShippingTemplatesNoDeliveryRespVO>> getList(@RequestParam Long tempId){
         return CommonResult.success(shippingTemplatesNoDeliveryService.getListGroup(tempId));
     }
 
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesRegionController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesRegionController.java
index 38644efd9..3e1c873c6 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesRegionController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesRegionController.java
@@ -43,7 +43,7 @@ public class ShippingTemplatesRegionController {
     @PreAuthorize("@ss.hasPermission('admin:shipping:templates:region:list')")
     @Operation(summary = "根据模板id查询数据")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<List<ShippingTemplatesRegionRespVO>> getList(@RequestParam Integer tempId){
+    public CommonResult<List<ShippingTemplatesRegionRespVO>> getList(@RequestParam Long tempId){
         return CommonResult.success(shippingTemplatesRegionService.getListGroup(tempId));
     }
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesDO.java
index 8a38f241e..55c184313 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesDO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesDO.java
@@ -29,7 +29,7 @@ public class ShippingTemplatesDO extends BaseDO {
     private static final long serialVersionUID=1L;
 
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Integer id;
+    private Long id;
 
     /**
      *模板名称
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java
index eee0c694c..5f8df0866 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java
@@ -31,12 +31,12 @@ public class ShippingTemplatesFreeDO implements Serializable {
     private static final long serialVersionUID=1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     /**
      * 模板ID
      */
-    private Integer tempId;
+    private Long tempId;
 
 
     private Integer provinceId;
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java
index 7790300b3..3699315d9 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java
@@ -30,12 +30,12 @@ public class ShippingTemplatesNoDeliveryDO implements Serializable {
     private static final long serialVersionUID=1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     /**
      * 模板ID
      */
-    private Integer tempId;
+    private Long tempId;
 
     /**
      *城市ID
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java
index 17b544165..eaae338ab 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java
@@ -31,12 +31,12 @@ public class ShippingTemplatesRegionDO implements Serializable {
     private static final long serialVersionUID=1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     /**
      * 模板ID
      */
-    private Integer tempId;
+    private Long tempId;
 
     /**
      *城市ID
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesFreeMapper.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesFreeMapper.java
index bbb40e3eb..37dc7e802 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesFreeMapper.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesFreeMapper.java
@@ -22,5 +22,5 @@ import java.util.List;
 @Mapper
 public interface ShippingTemplatesFreeMapper extends BaseMapperX<ShippingTemplatesFreeDO> {
 
-    List<ShippingTemplatesFreeRespVO> getListGroup(Integer tempId);
+    List<ShippingTemplatesFreeRespVO> getListGroup(Long tempId);
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java
index 1713de8cd..5b4b5c610 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java
@@ -22,6 +22,6 @@ import java.util.List;
 @Mapper
 public interface ShippingTemplatesNoDeliveryMapper extends BaseMapperX<ShippingTemplatesNoDeliveryDO> {
 
-    List<ShippingTemplatesNoDeliveryRespVO> getList(Integer tempId);
+    List<ShippingTemplatesNoDeliveryRespVO> getList(Long tempId);
 
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesRegionMapper.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesRegionMapper.java
index 3beeed1bd..c730ec7e6 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesRegionMapper.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesRegionMapper.java
@@ -22,5 +22,5 @@ import java.util.List;
 @Mapper
 public interface ShippingTemplatesRegionMapper extends BaseMapperX<ShippingTemplatesRegionDO> {
 
-    List<ShippingTemplatesRegionRespVO> getListGroup(Integer tempId);
+    List<ShippingTemplatesRegionRespVO> getListGroup(Long tempId);
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesFreeService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesFreeService.java
index dc99df313..a782b28a5 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesFreeService.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesFreeService.java
@@ -24,15 +24,15 @@ import java.util.List;
 @Validated
 public interface ShippingTemplatesFreeService extends IService<ShippingTemplatesFreeDO> {
 
-    void saveAll(List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList, Integer type, Integer id);
+    void saveAll(List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList, Integer type, Long id);
 
-    List<ShippingTemplatesFreeRespVO> getListGroup(Integer tempId);
+    List<ShippingTemplatesFreeRespVO> getListGroup(Long tempId);
 
     /**
      * 删除
      * @param tempId 运费模板id
      */
-    Boolean delete(Integer tempId);
+    Boolean delete(Long tempId);
 
     /**
      * 根据模板编号、城市ID查询
@@ -40,5 +40,5 @@ public interface ShippingTemplatesFreeService extends IService<ShippingTemplates
      * @param cityId 城市ID
      * @return 运费模板
      */
-    ShippingTemplatesFreeDO getByTempIdAndCityId(Integer tempId, Integer cityId);
+    ShippingTemplatesFreeDO getByTempIdAndCityId(Long tempId, Integer cityId);
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesNoDeliveryService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesNoDeliveryService.java
index a911950b4..ec8ab67e2 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesNoDeliveryService.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesNoDeliveryService.java
@@ -25,9 +25,9 @@ import java.util.List;
 @Validated
 public interface ShippingTemplatesNoDeliveryService extends IService<ShippingTemplatesNoDeliveryDO> {
 
-    void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesFreeRespVOList, Integer id);
+    void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesFreeRespVOList, Long id);
 
-    List<ShippingTemplatesNoDeliveryRespVO> getListGroup(Integer tempId);
+    List<ShippingTemplatesNoDeliveryRespVO> getListGroup(Long tempId);
 
     /**
      * 根据模板编号、城市ID查询
@@ -35,7 +35,7 @@ public interface ShippingTemplatesNoDeliveryService extends IService<ShippingTem
      * @param cityId 城市ID
      * @return 运费模板
      */
-    ShippingTemplatesNoDeliveryDO getByTempIdAndCityId(Integer tempId, Integer cityId);
+    ShippingTemplatesNoDeliveryDO getByTempIdAndCityId(Long tempId, Integer cityId);
 
-    public Boolean delete(Integer tempId);
+    public Boolean delete(Long tempId);
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesRegionService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesRegionService.java
index e681396ff..7ad0a618d 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesRegionService.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesRegionService.java
@@ -25,16 +25,16 @@ import java.util.List;
 @Validated
 public interface ShippingTemplatesRegionService extends IService<ShippingTemplatesRegionDO> {
 
-    void saveAll(List<ShippingTemplatesRegionRespVO> shippingTemplatesRegionRespVOList, Integer type, Integer id);
+    void saveAll(List<ShippingTemplatesRegionRespVO> shippingTemplatesRegionRespVOList, Integer type, Long id);
 
-    List<ShippingTemplatesRegionRespVO> getListGroup(Integer tempId);
+    List<ShippingTemplatesRegionRespVO> getListGroup(Long tempId);
 
     /**
      * 删除
      * @param tempId 运费模板id
      * @return Boolean
      */
-    Boolean delete(Integer tempId);
+    Boolean delete(Long tempId);
 
     /**
      * 根据模板编号、城市ID查询
@@ -42,5 +42,5 @@ public interface ShippingTemplatesRegionService extends IService<ShippingTemplat
      * @param cityId 城市ID
      * @return 运费模板
      */
-    ShippingTemplatesRegionDO getByTempIdAndCityId(Integer tempId, Integer cityId);
+    ShippingTemplatesRegionDO getByTempIdAndCityId(Long tempId, Integer cityId);
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesService.java
index 8b19b4f93..07af0d6e7 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesService.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesService.java
@@ -35,19 +35,19 @@ public interface ShippingTemplatesService extends IService<ShippingTemplatesDO>
      */
     Boolean create(ShippingTemplatesReqVO request);
 
-    Boolean update(Integer id, ShippingTemplatesReqVO request);
+    Boolean update(Long id, ShippingTemplatesReqVO request);
 
     /**
      * 删除模板
      * @param id 模板id
      * @return Boolean
      */
-    Boolean remove(Integer id);
+    Boolean remove(Long id);
 
     /**
      * 获取模板信息
      * @param id 模板id
      * @return ShippingTemplates
      */
-    ShippingTemplatesDO getInfo(Integer id);
+    ShippingTemplatesDO getInfo(Long id);
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java
index 9082dca02..4a536a9f8 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java
@@ -12,7 +12,6 @@ import cn.iocoder.yudao.module.shop.service.express.ShippingTemplatesFreeService
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -48,9 +47,8 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl<ShippingTempla
      * @author Mr.Zhang
      * @since 2020-05-20
      */
-    @Async
     @Override
-    public void saveAll(List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList, Integer type, Integer tempId) {
+    public void saveAll(List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList, Integer type, Long tempId) {
 
         ArrayList<ShippingTemplatesFreeDO> shippingTemplatesFreesListDO = new ArrayList<>();
 
@@ -82,6 +80,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl<ShippingTempla
 
         //删除模板下的无效数据
         deleteStatusFalse(tempId);
+
     }
 
     /**
@@ -105,7 +104,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl<ShippingTempla
      * @author Mr.Zhang
      * @since 2020-05-20
      */
-    private void updateStatus(Integer tempId) {
+    private void updateStatus(Long tempId) {
         LambdaQueryWrapper<ShippingTemplatesFreeDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getTempId, tempId);
 
@@ -119,7 +118,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl<ShippingTempla
      * @param tempId Integer 运费模板id
      */
     @Override
-    public Boolean delete(Integer tempId) {
+    public Boolean delete(Long tempId) {
         LambdaQueryWrapper<ShippingTemplatesFreeDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getTempId, tempId);
         return dao.delete(lambdaQueryWrapper) > 0;
@@ -129,7 +128,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl<ShippingTempla
      * 删除模板下的无效数据
      * @param tempId Integer 运费模板id
      */
-    public Boolean deleteStatusFalse(Integer tempId) {
+    public Boolean deleteStatusFalse(Long tempId) {
         LambdaQueryWrapper<ShippingTemplatesFreeDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getTempId, tempId);
         lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getStatus, false);
@@ -143,7 +142,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl<ShippingTempla
      * @return 运费模板
      */
     @Override
-    public ShippingTemplatesFreeDO getByTempIdAndCityId(Integer tempId, Integer cityId) {
+    public ShippingTemplatesFreeDO getByTempIdAndCityId(Long tempId, Integer cityId) {
         LambdaQueryWrapper<ShippingTemplatesFreeDO> lqw = new LambdaQueryWrapper<>();
         lqw.eq(ShippingTemplatesFreeDO::getTempId, tempId);
         lqw.eq(ShippingTemplatesFreeDO::getCityId, cityId);
@@ -159,7 +158,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl<ShippingTempla
      * @return List<ShippingTemplatesFreeRequest>
      */
     @Override
-    public List<ShippingTemplatesFreeRespVO> getListGroup(Integer tempId) {
+    public List<ShippingTemplatesFreeRespVO> getListGroup(Long tempId) {
         return dao.getListGroup(tempId);
     }
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java
index 6f32d1d9c..9ac009c18 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java
@@ -37,7 +37,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl<Shipping
      * @since 2020-05-20
      */
     @Override
-    public void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVOS, Integer tempId) {
+    public void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVOS, Long tempId) {
         ArrayList<ShippingTemplatesNoDeliveryDO> shippingTemplatesNoDeliveryDOS = new ArrayList<>();
 
         delete(tempId);
@@ -64,7 +64,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl<Shipping
      * @param tempId Integer 运费模板id
      */
     @Override
-    public Boolean delete(Integer tempId) {
+    public Boolean delete(Long tempId) {
         LambdaQueryWrapper<ShippingTemplatesNoDeliveryDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ShippingTemplatesNoDeliveryDO::getTempId, tempId);
         return shippingTemplatesNoDeliveryMapper.delete(lambdaQueryWrapper) > 0;
@@ -92,7 +92,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl<Shipping
      * @return List<ShippingTemplatesFreeRequest>
      */
     @Override
-    public List<ShippingTemplatesNoDeliveryRespVO> getListGroup(Integer tempId) {
+    public List<ShippingTemplatesNoDeliveryRespVO> getListGroup(Long tempId) {
         return shippingTemplatesNoDeliveryMapper.getList(tempId);
     }
 
@@ -103,7 +103,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl<Shipping
      * @return 运费模板
      */
     @Override
-    public ShippingTemplatesNoDeliveryDO getByTempIdAndCityId(Integer tempId, Integer cityId) {
+    public ShippingTemplatesNoDeliveryDO getByTempIdAndCityId(Long tempId, Integer cityId) {
         LambdaQueryWrapper<ShippingTemplatesNoDeliveryDO> lqw = new LambdaQueryWrapper<>();
         lqw.eq(ShippingTemplatesNoDeliveryDO::getTempId, tempId);
         lqw.eq(ShippingTemplatesNoDeliveryDO::getCityId, cityId);
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java
index 3654cc64c..b097ee8dd 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java
@@ -59,9 +59,8 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
      * @author Mr.Zhang
      * @since 2020-05-20
      */
-    @Async
     @Override
-    public void saveAll(List<ShippingTemplatesRegionRespVO> shippingTemplatesRegionRespVOList, Integer type, Integer tempId) {
+    public void saveAll(List<ShippingTemplatesRegionRespVO> shippingTemplatesRegionRespVOList, Integer type, Long tempId) {
         ArrayList<ShippingTemplatesRegionDO> shippingTemplatesRegionDOList = new ArrayList<>();
 
         //把目前模板下的所有数据标记为无效
@@ -95,6 +94,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
 
         //删除模板下的无效数据
         deleteStatusFalse(tempId);
+
     }
 
     /**
@@ -120,7 +120,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
      * @author Mr.Zhang
      * @since 2020-05-20
      */
-    private void updateStatus(Integer tempId) {
+    private void updateStatus(Long tempId) {
         LambdaQueryWrapper<ShippingTemplatesRegionDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId);
 
@@ -134,7 +134,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
      * @param tempId Integer 运费模板id
      * @return Boolean
      */
-    public Boolean deleteStatusFalse(Integer tempId) {
+    public Boolean deleteStatusFalse(Long tempId) {
         LambdaQueryWrapper<ShippingTemplatesRegionDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId);
         lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getStatus, false);
@@ -148,7 +148,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
      * @return 运费模板
      */
     @Override
-    public ShippingTemplatesRegionDO getByTempIdAndCityId(Integer tempId, Integer cityId) {
+    public ShippingTemplatesRegionDO getByTempIdAndCityId(Long tempId, Integer cityId) {
         LambdaQueryWrapper<ShippingTemplatesRegionDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId);
         lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getCityId, cityId);
@@ -163,12 +163,12 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
      * @return List<ShippingTemplatesRegionRequest>
      */
     @Override
-    public List<ShippingTemplatesRegionRespVO> getListGroup(Integer tempId) {
+    public List<ShippingTemplatesRegionRespVO> getListGroup(Long tempId) {
         return dao.getListGroup(tempId);
     }
 
     @Override
-    public Boolean delete(Integer tempId) {
+    public Boolean delete(Long tempId) {
         LambdaQueryWrapper<ShippingTemplatesRegionDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId);
         return dao.delete(lambdaQueryWrapper) > 0;
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java
index 2a0984795..7b2d86a3d 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java
@@ -146,7 +146,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
      * @param request ShippingTemplatesRequest 新增参数
      */
     @Override
-    public Boolean update(Integer id, ShippingTemplatesReqVO request) {
+    public Boolean update(Long id, ShippingTemplatesReqVO request) {
         ShippingTemplatesDO shippingTemplatesDO = new ShippingTemplatesDO();
         shippingTemplatesDO.setId(id);
         shippingTemplatesDO.setName(request.getName());
@@ -184,7 +184,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
      * @return boolean
      */
     @Override
-    public Boolean remove(Integer id) {
+    public Boolean remove(Long id) {
         return transactionTemplate.execute(e -> {
             shippingTemplatesRegionService.delete(id);
             shippingTemplatesFreeService.delete(id);
@@ -200,7 +200,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
      * @return ShippingTemplates
      */
     @Override
-    public ShippingTemplatesDO getInfo(Integer id) {
+    public ShippingTemplatesDO getInfo(Long id) {
         ShippingTemplatesDO template = getById(id);
         if (ObjectUtil.isNull(template)) {
             throw new ServiceException("模板不存在");
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
index ded5c0bdf..bdd5dd44f 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
@@ -4,19 +4,19 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.module.member.api.address.AddressApi;
-import cn.iocoder.yudao.module.member.api.address.UserAddressApi;
-import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
-import cn.iocoder.yudao.module.member.api.address.dto.UserAddressRespDTO;
-import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
-import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.shop.constants.PayConstants;
 import cn.iocoder.yudao.framework.common.enums.Constants;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.DateLimitUtilVo;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.module.infra.api.config.ApiConfigApi;
+import cn.iocoder.yudao.module.member.api.address.AddressApi;
+import cn.iocoder.yudao.module.member.api.address.UserAddressApi;
+import cn.iocoder.yudao.module.member.api.address.dto.UserAddressRespDTO;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.shop.constants.PayConstants;
 import cn.iocoder.yudao.module.shop.constants.SysConfigConstants;
 import cn.iocoder.yudao.module.shop.convert.order.StoreOrderConvert;
 import cn.iocoder.yudao.module.shop.convert.order.StoreOrderOneConvert;
@@ -28,7 +28,6 @@ import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrder;
 import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrderInfo;
 import cn.iocoder.yudao.module.shop.dal.dataobject.product.StoreProduct;
 import cn.iocoder.yudao.module.shop.dal.dataobject.product.StoreProductAttrValue;
-import cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesMapper;
 import cn.iocoder.yudao.module.shop.dal.mysql.order.StoreOrderMapper;
 import cn.iocoder.yudao.module.shop.request.order.*;
 import cn.iocoder.yudao.module.shop.request.product.StoreProductReplyAddRequest;
@@ -47,7 +46,10 @@ import cn.iocoder.yudao.module.shop.service.product.StoreProductService;
 import cn.iocoder.yudao.module.shop.utils.CrmebUtil;
 import cn.iocoder.yudao.module.shop.utils.OrderUtil;
 import cn.iocoder.yudao.module.shop.utils.RedisUtil;
-import cn.iocoder.yudao.module.shop.vo.order.*;
+import cn.iocoder.yudao.module.shop.vo.order.OrderInfoDetailVo;
+import cn.iocoder.yudao.module.shop.vo.order.OrderInfoVo;
+import cn.iocoder.yudao.module.shop.vo.order.StoreOrderInfoOldVo;
+import cn.iocoder.yudao.module.shop.vo.order.StoreOrderInfoVo;
 import cn.iocoder.yudao.module.shop.vo.product.MyRecord;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -62,7 +64,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionTemplate;
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -692,7 +693,7 @@ public class OrderServiceImpl implements OrderService {
 
             for (Map.Entry<Integer, MyRecord> m : proMap.entrySet()) {
                 MyRecord value = m.getValue();
-                Integer tempId = value.getInt("tempId");
+                Long tempId = value.getLong("tempId");
                 ShippingTemplatesDO shippingTemplatesDO = shippingTemplatesApi.getById(tempId);
                 if (shippingTemplatesDO.getAppoint()) {// 指定包邮
                     // 判断是否在指定包邮区域内
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml
index 818c5057c..a49c12531 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesFreeMapper">
 
-    <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesFreeRespVO" parameterType="integer">
+    <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesFreeRespVO" parameterType="Long">
         SELECT
             city_id, province_id, title, `number`, price, uniqid
         FROM
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml
index 6b042f88e..856d423e4 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesNoDeliveryMapper">
 
-    <select id="getList" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO" parameterType="integer">
+    <select id="getList" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO" parameterType="Long">
         SELECT
             city_id, province_id, title, uniqid
         FROM
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml
index c984f8d77..3cb6e86ad 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesRegionMapper">
 
-    <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesRegionRespVO" parameterType="integer">
+    <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesRegionRespVO" parameterType="Long">
         SELECT
             city_id, province_id, `first`, first_price, title, `renewal`, renewal_price, uniqid
         FROM