From b53976500a74d9f5c152ddeba57d7a176c6d9eba Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sat, 6 Apr 2024 21:50:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 1 + .../atguigu/ssyx/model/sys/RegionWare.java | 34 ++-- service-client/pom.xml | 1 + service-client/service-region-client/pom.xml | 23 +++ .../ssyx/client/region/RegionFeignClient.java | 12 ++ .../activity/mapper/CouponRangeMapper.java | 4 +- .../ssyx/activity/mapper/SecKillMapper.java | 2 + .../mapper/SecKillSkuNoticeMapper.java | 2 + .../activity/mapper/SeckillTimeMapper.java | 3 +- .../ssyx/activity/mapper/SkuInfoMapper.java | 2 + .../resources/mapper/CouponRangeMapper.xml | 5 + .../resources/mapper/SeckillSkuMapper.xml | 2 +- .../sys/api/RegionWareInnerController.java | 27 +++ .../src/main/resources/application.yml | 2 +- service/service-user/pom.xml | 2 +- .../com/atguigu/ssyx/user/entity/Leader.java | 162 ------------------ .../ssyx/user/entity/UserDelivery.java | 66 ------- .../ssyx/user/mapper/LeaderMapper.java | 2 +- .../ssyx/user/mapper/UserDeliveryMapper.java | 2 +- .../ssyx/user/service/LeaderService.java | 2 +- .../user/service/UserDeliveryService.java | 2 +- .../user/service/impl/LeaderServiceImpl.java | 2 +- .../service/impl/UserDeliveryServiceImpl.java | 2 +- .../user/service/impl/UserServiceImpl.java | 7 +- .../service/impl/WeiXinApiServiceImpl.java | 3 +- .../xml => resources/mapper}/LeaderMapper.xml | 0 .../mapper}/UserDeliveryMapper.xml | 0 27 files changed, 111 insertions(+), 261 deletions(-) create mode 100644 service-client/service-region-client/pom.xml create mode 100644 service-client/service-region-client/src/main/java/com/atguigu/ssyx/client/region/RegionFeignClient.java create mode 100644 service/service-activity/src/main/resources/mapper/CouponRangeMapper.xml create mode 100644 service/service-sys/src/main/java/com/atguigu/ssyx/sys/api/RegionWareInnerController.java delete mode 100644 service/service-user/src/main/java/com/atguigu/ssyx/user/entity/Leader.java delete mode 100644 service/service-user/src/main/java/com/atguigu/ssyx/user/entity/UserDelivery.java rename service/service-user/src/main/{java/com/atguigu/ssyx/user/mapper/xml => resources/mapper}/LeaderMapper.xml (100%) rename service/service-user/src/main/{java/com/atguigu/ssyx/user/mapper/xml => resources/mapper}/UserDeliveryMapper.xml (100%) diff --git a/.idea/encodings.xml b/.idea/encodings.xml index fd2a54c..8148a29 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -15,6 +15,7 @@ + diff --git a/model/src/main/java/com/atguigu/ssyx/model/sys/RegionWare.java b/model/src/main/java/com/atguigu/ssyx/model/sys/RegionWare.java index 41eb0ef..7909bd6 100644 --- a/model/src/main/java/com/atguigu/ssyx/model/sys/RegionWare.java +++ b/model/src/main/java/com/atguigu/ssyx/model/sys/RegionWare.java @@ -11,27 +11,25 @@ import lombok.Data; @ApiModel(description = "RegionWare") @TableName("region_ware") public class RegionWare extends BaseEntity { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "开通区域") + @TableField("region_id") + private Long regionId; - @ApiModelProperty(value = "开通区域") - @TableField("region_id") - private Long regionId; + @ApiModelProperty(value = "区域名称") + @TableField("region_name") + private String regionName; - @ApiModelProperty(value = "区域名称") - @TableField("region_name") - private String regionName; + @ApiModelProperty(value = "仓库") + @TableField("ware_id") + private Long wareId; - @ApiModelProperty(value = "仓库") - @TableField("ware_id") - private Long wareId; - - @ApiModelProperty(value = "仓库名称") - @TableField("ware_name") - private String wareName; - - @ApiModelProperty(value = "状态（0：未开通 1：已开通）") - @TableField("status") - private Integer status; + @ApiModelProperty(value = "仓库名称") + @TableField("ware_name") + private String wareName; + @ApiModelProperty(value = "状态（0：未开通 1：已开通）") + @TableField("status") + private Integer status; } \ No newline at end of file diff --git a/service-client/pom.xml b/service-client/pom.xml index b6ad079..0127fef 100644 --- a/service-client/pom.xml +++ b/service-client/pom.xml @@ -14,6 +14,7 @@ https://maven.apache.org service-product-client + service-region-client diff --git a/service-client/service-region-client/pom.xml b/service-client/service-region-client/pom.xml new file mode 100644 index 0000000..406ec1e --- /dev/null +++ b/service-client/service-region-client/pom.xml @@ -0,0 +1,23 @@ + + 4.0.0 + + com.atguigu + service-client + 1.0-SNAPSHOT + + + service-region-client + jar + + service-region-client + https://maven.apache.org + + + UTF-8 + + + + + + diff --git a/service-client/service-region-client/src/main/java/com/atguigu/ssyx/client/region/RegionFeignClient.java b/service-client/service-region-client/src/main/java/com/atguigu/ssyx/client/region/RegionFeignClient.java new file mode 100644 index 0000000..b216a76 --- /dev/null +++ b/service-client/service-region-client/src/main/java/com/atguigu/ssyx/client/region/RegionFeignClient.java @@ -0,0 +1,12 @@ +package com.atguigu.ssyx.client.region; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@FeignClient(value = "service-sys", path = "/admin/sys/regionWare") +public interface RegionFeignClient { + // 根据RegionId查询WareId + @GetMapping("getWareId") + Long getWareId(@RequestParam Long regionId); +} diff --git a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/CouponRangeMapper.java b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/CouponRangeMapper.java index 089c024..76f8e54 100644 --- a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/CouponRangeMapper.java +++ b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/CouponRangeMapper.java @@ -2,8 +2,8 @@ package com.atguigu.ssyx.activity.mapper; import com.atguigu.ssyx.model.activity.CouponRange; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springframework.stereotype.Repository; +import org.apache.ibatis.annotations.Mapper; -@Repository +@Mapper public interface CouponRangeMapper extends BaseMapper { } diff --git a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SecKillMapper.java b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SecKillMapper.java index ac9b932..9e49a14 100644 --- a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SecKillMapper.java +++ b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SecKillMapper.java @@ -2,6 +2,7 @@ package com.atguigu.ssyx.activity.mapper; import com.atguigu.ssyx.model.activity.Seckill; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author bunny * @since 2024-04-06 */ +@Mapper public interface SecKillMapper extends BaseMapper { } diff --git a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SecKillSkuNoticeMapper.java b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SecKillSkuNoticeMapper.java index 968a713..d999c4e 100644 --- a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SecKillSkuNoticeMapper.java +++ b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SecKillSkuNoticeMapper.java @@ -2,6 +2,7 @@ package com.atguigu.ssyx.activity.mapper; import com.atguigu.ssyx.model.activity.SeckillSkuNotice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author bunny * @since 2024-04-06 */ +@Mapper public interface SecKillSkuNoticeMapper extends BaseMapper { } diff --git a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SeckillTimeMapper.java b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SeckillTimeMapper.java index f0b3c99..00b2f4e 100644 --- a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SeckillTimeMapper.java +++ b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SeckillTimeMapper.java @@ -2,8 +2,9 @@ package com.atguigu.ssyx.activity.mapper; import com.atguigu.ssyx.model.activity.SeckillTime; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; - +@Mapper public interface SeckillTimeMapper extends BaseMapper { } diff --git a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SkuInfoMapper.java b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SkuInfoMapper.java index 6d80c3b..f70ac55 100644 --- a/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SkuInfoMapper.java +++ b/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/SkuInfoMapper.java @@ -2,6 +2,7 @@ package com.atguigu.ssyx.activity.mapper; import com.atguigu.ssyx.model.product.SkuInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author bunny * @since 2024-04-06 */ +@Mapper public interface SkuInfoMapper extends BaseMapper { } diff --git a/service/service-activity/src/main/resources/mapper/CouponRangeMapper.xml b/service/service-activity/src/main/resources/mapper/CouponRangeMapper.xml new file mode 100644 index 0000000..200b0d0 --- /dev/null +++ b/service/service-activity/src/main/resources/mapper/CouponRangeMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/service/service-activity/src/main/resources/mapper/SeckillSkuMapper.xml b/service/service-activity/src/main/resources/mapper/SeckillSkuMapper.xml index c6d7021..5d1f83d 100644 --- a/service/service-activity/src/main/resources/mapper/SeckillSkuMapper.xml +++ b/service/service-activity/src/main/resources/mapper/SeckillSkuMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/api/RegionWareInnerController.java b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/api/RegionWareInnerController.java new file mode 100644 index 0000000..492401f --- /dev/null +++ b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/api/RegionWareInnerController.java @@ -0,0 +1,27 @@ +package com.atguigu.ssyx.sys.api; + +import com.atguigu.ssyx.model.sys.RegionWare; +import com.atguigu.ssyx.sys.service.RegionWareService; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Api(value = "RegionWare管理", tags = "RegionWare管理") +@RestController +@RequestMapping(value = "/admin/sys/regionWare") +public class RegionWareInnerController { + @Autowired + private RegionWareService regionWareService; + + @ApiOperation(value = "根据RegionId查询WareId") + @GetMapping("getWareId") + public Long getWareId(@RequestParam Long regionId) { + RegionWare regionWare = regionWareService.getOne(Wrappers.lambdaQuery().eq(RegionWare::getRegionId, regionId)); + return regionWare.getWareId(); + } +} diff --git a/service/service-sys/src/main/resources/application.yml b/service/service-sys/src/main/resources/application.yml index 54444cc..b28bf7b 100644 --- a/service/service-sys/src/main/resources/application.yml +++ b/service/service-sys/src/main/resources/application.yml @@ -30,7 +30,7 @@ spring: mybatis-plus: type-enums-package: com.atguigu.ssyx.enums # 加上枚举类型 - type-aliases-package: com.atguigu.ssyx # 配置每个包前缀 + type-aliases-package: com.atguigu.ssyx.model # 配置每个包前缀 mapper-locations: classpath:mapper/*.xml configuration: map-underscore-to-camel-case: true diff --git a/service/service-user/pom.xml b/service/service-user/pom.xml index f219b14..93a3661 100644 --- a/service/service-user/pom.xml +++ b/service/service-user/pom.xml @@ -25,7 +25,7 @@ com.atguigu - service-product-client + service-region-client 1.0-SNAPSHOT diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/entity/Leader.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/entity/Leader.java deleted file mode 100644 index 2aa0eec..0000000 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/entity/Leader.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.atguigu.ssyx.user.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - *

- * 团长表 - *

- * - * @author bunny - * @since 2024-04-06 - */ -@Data -@EqualsAndHashCode(callSuper = false) -public class Leader implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 用户id - */ - private Long userId; - - /** - * 区域id - */ - private Long regionId; - - /** - * 名称 - */ - private String name; - - /** - * 手机号码 - */ - private String phone; - - /** - * 身份证 - */ - private String idNo; - - /** - * 身份证图片路径 - */ - private String idNoUrl1; - - /** - * 身份证图片路径 - */ - private String idNoUrl2; - - /** - * 提货点名称 - */ - private String takeName; - - /** - * 提货点类型；1->宝妈；2->便利店店主；3->快递站点；4->物业中心 - */ - private String takeType; - - /** - * 省 - */ - private Long province; - - /** - * 城市 - */ - private Long city; - - /** - * 区域code - */ - private Long district; - - /** - * 详细地址 - */ - private String detailAddress; - - /** - * 经度 - */ - private BigDecimal longitude; - - /** - * 纬度 - */ - private BigDecimal latitude; - - /** - * 有无门店 - */ - private String haveStore; - - /** - * 门店照片 - */ - private String storePath; - - /** - * 营业时间 - */ - private String workTime; - - /** - * 营业状态 - */ - private Integer workStatus; - - /** - * 审核状态（0：提交审核 1：审核通过 -1：审核未通过） - */ - private Integer checkStatus; - - /** - * 审核时间 - */ - private LocalDateTime checkTime; - - /** - * 审核用户 - */ - private String checkUser; - - /** - * 审核内容 - */ - private String checkContent; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 删除标记（0:不可用 1:可用） - */ - private Integer isDeleted; - - -} diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/entity/UserDelivery.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/entity/UserDelivery.java deleted file mode 100644 index 76d1823..0000000 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/entity/UserDelivery.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.atguigu.ssyx.user.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - *

- * 会员提货记录表 - *

- * - * @author bunny - * @since 2024-04-06 - */ -@Data -@EqualsAndHashCode(callSuper = false) -public class UserDelivery implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 会员ID - */ - private String userId; - - /** - * 团长id - */ - private Long leaderId; - - /** - * 仓库id - */ - private Long wareId; - - /** - * 是否默认 - */ - private String isDefault; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 删除标记（0:不可用 1:可用） - */ - private Integer isDeleted; - - -} diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/LeaderMapper.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/LeaderMapper.java index 27e2d06..3415b0d 100644 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/LeaderMapper.java +++ b/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/LeaderMapper.java @@ -1,6 +1,6 @@ package com.atguigu.ssyx.user.mapper; -import com.atguigu.ssyx.user.entity.Leader; +import com.atguigu.ssyx.model.user.Leader; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/UserDeliveryMapper.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/UserDeliveryMapper.java index 95b08bd..24fdc11 100644 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/UserDeliveryMapper.java +++ b/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/UserDeliveryMapper.java @@ -1,6 +1,6 @@ package com.atguigu.ssyx.user.mapper; -import com.atguigu.ssyx.user.entity.UserDelivery; +import com.atguigu.ssyx.model.user.UserDelivery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/LeaderService.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/LeaderService.java index 053ad8f..f92d2f9 100644 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/LeaderService.java +++ b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/LeaderService.java @@ -1,6 +1,6 @@ package com.atguigu.ssyx.user.service; -import com.atguigu.ssyx.user.entity.Leader; +import com.atguigu.ssyx.model.user.Leader; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/UserDeliveryService.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/UserDeliveryService.java index d71dd79..45d5b75 100644 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/UserDeliveryService.java +++ b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/UserDeliveryService.java @@ -1,6 +1,6 @@ package com.atguigu.ssyx.user.service; -import com.atguigu.ssyx.user.entity.UserDelivery; +import com.atguigu.ssyx.model.user.UserDelivery; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/LeaderServiceImpl.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/LeaderServiceImpl.java index aca3027..7c6a289 100644 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/LeaderServiceImpl.java +++ b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/LeaderServiceImpl.java @@ -1,6 +1,6 @@ package com.atguigu.ssyx.user.service.impl; -import com.atguigu.ssyx.user.entity.Leader; +import com.atguigu.ssyx.model.user.Leader; import com.atguigu.ssyx.user.mapper.LeaderMapper; import com.atguigu.ssyx.user.service.LeaderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/UserDeliveryServiceImpl.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/UserDeliveryServiceImpl.java index ddb6beb..17a48f1 100644 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/UserDeliveryServiceImpl.java +++ b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/UserDeliveryServiceImpl.java @@ -1,6 +1,6 @@ package com.atguigu.ssyx.user.service.impl; -import com.atguigu.ssyx.user.entity.UserDelivery; +import com.atguigu.ssyx.model.user.UserDelivery; import com.atguigu.ssyx.user.mapper.UserDeliveryMapper; import com.atguigu.ssyx.user.service.UserDeliveryService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/UserServiceImpl.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/UserServiceImpl.java index 1c0fa47..c29984c 100644 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/UserServiceImpl.java +++ b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/UserServiceImpl.java @@ -1,9 +1,10 @@ package com.atguigu.ssyx.user.service.impl; +import com.atguigu.ssyx.client.region.RegionFeignClient; import com.atguigu.ssyx.enums.UserType; +import com.atguigu.ssyx.model.user.Leader; import com.atguigu.ssyx.model.user.User; -import com.atguigu.ssyx.user.entity.Leader; -import com.atguigu.ssyx.user.entity.UserDelivery; +import com.atguigu.ssyx.model.user.UserDelivery; import com.atguigu.ssyx.user.mapper.UserMapper; import com.atguigu.ssyx.user.service.LeaderService; import com.atguigu.ssyx.user.service.UserDeliveryService; @@ -23,6 +24,8 @@ public class UserServiceImpl extends ServiceImpl implements Us private UserDeliveryService userDeliveryService; @Autowired private LeaderService leaderService; + @Autowired + private RegionFeignClient regionFeignClient; /** * 先根据openid进行数据库查询 diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/WeiXinApiServiceImpl.java b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/WeiXinApiServiceImpl.java index b2679cc..5a891e7 100644 --- a/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/WeiXinApiServiceImpl.java +++ b/service/service-user/src/main/java/com/atguigu/ssyx/user/service/impl/WeiXinApiServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; @Service @Slf4j @@ -44,7 +45,7 @@ public class WeiXinApiServiceImpl implements WeiXinApiService { String result = HttpClientUtils.get(accessTokenUrl); // 请求微信接口服，返回两个值 session_key 和 openId JSONObject jsonObject = JSONObject.parseObject(result); - String accessToken = jsonObject.getString("session_key"); + // String accessToken = jsonObject.getString("session_key"); String openId = jsonObject.getString("openid"); // 先根据openid进行数据库查询 User user = userService.getUserByOpenId(openId); diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/xml/LeaderMapper.xml b/service/service-user/src/main/resources/mapper/LeaderMapper.xml similarity index 100% rename from service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/xml/LeaderMapper.xml rename to service/service-user/src/main/resources/mapper/LeaderMapper.xml diff --git a/service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/xml/UserDeliveryMapper.xml b/service/service-user/src/main/resources/mapper/UserDeliveryMapper.xml similarity index 100% rename from service/service-user/src/main/java/com/atguigu/ssyx/user/mapper/xml/UserDeliveryMapper.xml rename to service/service-user/src/main/resources/mapper/UserDeliveryMapper.xml