From 906a5cbd80021032c2c28752ff2a927c633481d0 Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Fri, 26 May 2023 11:53:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/libs/pay.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-ui-app/libs/pay.js b/yudao-ui-app/libs/pay.js index 9b9554783..a6635551f 100644 --- a/yudao-ui-app/libs/pay.js +++ b/yudao-ui-app/libs/pay.js @@ -7,8 +7,8 @@ const payTypes = ['WXPAY', 'ALIPAY'] * @param payInfo // 支付下单信息 * @param payType // 支付类型 * @param createOrderFun // 预下单方法 - * @param wxPaySuccess // 微信支付成功回调 - * @param aliPaySuccess // 支付宝支付成功回调 + * @param wxPaySuccess // 微信支付下单支付成功回调 + * @param aliPaySuccess // 支付宝支付下单成功回调 */ const unityPay = (options) => { let _options = { 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 2/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BF=AE=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 delete(@RequestParam(value = "id") Integer id){ + public CommonResult 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 update(@RequestParam Integer id, @RequestBody @Validated ShippingTemplatesReqVO request){ + public CommonResult 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 info(@RequestParam(value = "id") Integer id){ + public CommonResult 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> getList(@RequestParam Integer tempId){ + public CommonResult> 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> getList(@RequestParam Integer tempId){ + public CommonResult> 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> getList(@RequestParam Integer tempId){ + public CommonResult> 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 { - List getListGroup(Integer tempId); + List 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 { - List getList(Integer tempId); + List 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 { - List getListGroup(Integer tempId); + List 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 { - void saveAll(List shippingTemplatesFreeRespVOList, Integer type, Integer id); + void saveAll(List shippingTemplatesFreeRespVOList, Integer type, Long id); - List getListGroup(Integer tempId); + List getListGroup(Long tempId); /** * 删除 * @param tempId 运费模板id */ - Boolean delete(Integer tempId); + Boolean delete(Long tempId); /** * 根据模板编号、城市ID查询 @@ -40,5 +40,5 @@ public interface ShippingTemplatesFreeService extends IService { - void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesFreeRespVOList, Integer id); + void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesFreeRespVOList, Long id); - List getListGroup(Integer tempId); + List getListGroup(Long tempId); /** * 根据模板编号、城市ID查询 @@ -35,7 +35,7 @@ public interface ShippingTemplatesNoDeliveryService extends IService { - void saveAll(List shippingTemplatesRegionRespVOList, Integer type, Integer id); + void saveAll(List shippingTemplatesRegionRespVOList, Integer type, Long id); - List getListGroup(Integer tempId); + List 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 */ 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 shippingTemplatesFreeRespVOList, Integer type, Integer tempId) { + public void saveAll(List shippingTemplatesFreeRespVOList, Integer type, Long tempId) { ArrayList shippingTemplatesFreesListDO = new ArrayList<>(); @@ -82,6 +80,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getTempId, tempId); @@ -119,7 +118,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getTempId, tempId); return dao.delete(lambdaQueryWrapper) > 0; @@ -129,7 +128,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getTempId, tempId); lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getStatus, false); @@ -143,7 +142,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(ShippingTemplatesFreeDO::getTempId, tempId); lqw.eq(ShippingTemplatesFreeDO::getCityId, cityId); @@ -159,7 +158,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl */ @Override - public List getListGroup(Integer tempId) { + public List 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 shippingTemplatesNoDeliveryDOS = new ArrayList<>(); delete(tempId); @@ -64,7 +64,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesNoDeliveryDO::getTempId, tempId); return shippingTemplatesNoDeliveryMapper.delete(lambdaQueryWrapper) > 0; @@ -92,7 +92,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl */ @Override - public List getListGroup(Integer tempId) { + public List getListGroup(Long tempId) { return shippingTemplatesNoDeliveryMapper.getList(tempId); } @@ -103,7 +103,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl 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 shippingTemplatesRegionRespVOList, Integer type, Integer tempId) { + public void saveAll(List shippingTemplatesRegionRespVOList, Integer type, Long tempId) { ArrayList shippingTemplatesRegionDOList = new ArrayList<>(); //把目前模板下的所有数据标记为无效 @@ -95,6 +94,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId); @@ -134,7 +134,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getStatus, false); @@ -148,7 +148,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getCityId, cityId); @@ -163,12 +163,12 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl */ @Override - public List getListGroup(Integer tempId) { + public List getListGroup(Long tempId) { return dao.getListGroup(tempId); } @Override - public Boolean delete(Integer tempId) { + public Boolean delete(Long tempId) { LambdaQueryWrapper 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 { shippingTemplatesRegionService.delete(id); shippingTemplatesFreeService.delete(id); @@ -200,7 +200,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl 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 @@ - 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 @@ - 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 @@ - SELECT city_id, province_id, `first`, first_price, title, `renewal`, renewal_price, uniqid FROM From 23560dc45e3269ce79ed4092f6aecd996fb08f12 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 13:19:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index 87f3a7fa6..0b9da0c0b 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -240,5 +240,5 @@ wx: database: 16 # 数据库索引 password: 20221122@dev # 密码，建议生产环境开启 phone: - query-url: http://cy-phone-bill-inquiry-server:4006/cyywl-phone-query-api/ + query-url: http://192.168.1.94:4006/cyywl-phone-query-api/ token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0 \ No newline at end of file From e14b6608ef5ddb9baf828680a6814b9eaf95ab1a Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 13:45:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/member/service/promoter/PromoterServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java index a0b8708ec..ba044b319 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.exception.ServiceException; import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.enums.ErrorCodeConstants; import cn.iocoder.yudao.module.member.service.user.MemberUserService; @@ -71,11 +72,11 @@ public class PromoterServiceImpl implements PromoterService { memberUserDO.setMobile(createReqVO.getMobile()); memberUserDO.setStatus(createReqVO.getStatus()); memberUserDO.setPassword(createReqVO.getMobile().substring(createReqVO.getMobile().length() - 6)); - memberUserService.createUserIfAbsent(createReqVO.getMobile(), createReqVO.getNickname(), getClientIP()); + memberUserDO = memberUserService.createUserIfAbsent(createReqVO.getMobile(), createReqVO.getNickname(), getClientIP()); } // 插入 PromoterDO promoter = PromoterConvert.INSTANCE.convert(createReqVO); - promoter.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId()); + promoter.setTenantId(TenantContextHolder.getTenantId()); Long count = promoterMapper.selectCount(Wrappers.lambdaQuery(PromoterDO.class).eq(PromoterDO::getUserId, memberUserDO.getId())); if (count > 0) { throw new ServiceException(PROMOTER_EXISTS); From 93d971598486f259786ce01123d568d0eb763a7f Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 13:47:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index 0b9da0c0b..87f3a7fa6 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -240,5 +240,5 @@ wx: database: 16 # 数据库索引 password: 20221122@dev # 密码，建议生产环境开启 phone: - query-url: http://192.168.1.94:4006/cyywl-phone-query-api/ + query-url: http://cy-phone-bill-inquiry-server:4006/cyywl-phone-query-api/ token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0 \ No newline at end of file