From 396f0b6e1a42799eabee1b13aa6a9d7ea3356520 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 15:58:06 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/entity/MallLeaderDefault.java | 17 +++++++++++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 14 ++++++++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 3 +++
src/main/java/cc/mrbird/febs/mall/mapper/MallLeaderDefaultMapper.java | 11 +++++++++++
src/main/resources/mapper/modules/MallLeaderDefaultMapper.xml | 8 ++++++++
5 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallLeaderDefault.java b/src/main/java/cc/mrbird/febs/mall/entity/MallLeaderDefault.java
new file mode 100644
index 0000000..a94b961
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallLeaderDefault.java
@@ -0,0 +1,17 @@
+package cc.mrbird.febs.mall.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+//默认团长
+@Data
+@TableName("mall_leader_default")
+public class MallLeaderDefault {
+
+ private Long id;
+
+ private Long memberId;
+
+ private String uniqueCode;
+
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallLeaderDefaultMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallLeaderDefaultMapper.java
new file mode 100644
index 0000000..8016bc5
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallLeaderDefaultMapper.java
@@ -0,0 +1,11 @@
+package cc.mrbird.febs.mall.mapper;
+
+import cc.mrbird.febs.mall.entity.MallLeaderDefault;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+public interface MallLeaderDefaultMapper extends BaseMapper<MallLeaderDefault> {
+
+ MallLeaderDefault selectByMemberId(@Param("memberId")Long id);
+
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 3339e6c..1483a82 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -100,6 +100,9 @@
//订单范围内才允许下单
MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
+ if(ObjectUtil.isEmpty(address)){
+ throw new FebsException("请重新选择提货人信息");
+ }
// MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
// if(ObjectUtil.isNotEmpty(mallElectronicFence)){
// String inStr = iMallElectronicFenceService.fenceToLocation(mallElectronicFence.getGKey(),
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 738bc5c..9445b23 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -64,6 +64,7 @@
private final MallGoodsSkuMapper mallGoodsSkuMapper;
private final MallElectronicFenceMapper mallElectronicFenceMapper;
private final IMallElectronicFenceServiceImpl iMallElectronicFenceService;
+ private final MallLeaderDefaultMapper mallLeaderDefaultMapper;
@Override
@Transactional
@@ -154,6 +155,7 @@
@Override
public FebsResponse getApiLeaderInfoVoById(Long id) {
+ MallMember member = LoginUserUtil.getLoginUser();
MallTeamLeader mallTeamLeader = this.baseMapper.selectById(id);
ApiLeaderInfoVo apiLeaderInfoVo = new ApiLeaderInfoVo();
apiLeaderInfoVo.setId(mallTeamLeader.getId());
@@ -171,6 +173,11 @@
String longLatStr = mallElectronicFence.getLonglatiarr();
apiLeaderInfoVo.setLonglatiarr(longLatStr);
}
+ mallLeaderDefaultMapper.deleteById(mallLeaderDefaultMapper.selectByMemberId(member.getId()).getId());
+ MallLeaderDefault mallLeaderDefault = new MallLeaderDefault();
+ mallLeaderDefault.setMemberId(member.getId());
+ mallLeaderDefault.setUniqueCode(mallTeamLeader.getUniqueCode());
+ mallLeaderDefaultMapper.insert(mallLeaderDefault);
return new FebsResponse().success().data(apiLeaderInfoVo);
}
@@ -279,6 +286,13 @@
Double latitude = apiLeaderTitleDto.getLatitude() == null ? 0 : apiLeaderTitleDto.getLatitude();
ApiLeaderInfoVo apiLeaderInfoVo = new ApiLeaderInfoVo();
MallTeamLeader mallTeamLeader = new MallTeamLeader();
+ MallMember member = LoginUserUtil.getLoginUser();
+ if(ObjectUtil.isNotEmpty(member)){
+ MallLeaderDefault mallLeaderDefault = mallLeaderDefaultMapper.selectByMemberId(member.getId());
+ if(ObjectUtil.isNotEmpty(mallLeaderDefault)){
+ mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(mallLeaderDefault.getUniqueCode());
+ }
+ }
//特征码扫码
if(StrUtil.isNotEmpty(uniqueCode)){
mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(uniqueCode);
diff --git a/src/main/resources/mapper/modules/MallLeaderDefaultMapper.xml b/src/main/resources/mapper/modules/MallLeaderDefaultMapper.xml
new file mode 100644
index 0000000..afc48a7
--- /dev/null
+++ b/src/main/resources/mapper/modules/MallLeaderDefaultMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.mrbird.febs.mall.mapper.MallLeaderDefaultMapper">
+
+ <select id="selectByMemberId" resultType="cc.mrbird.febs.mall.entity.MallLeaderDefault">
+ select * from mall_leader_default where member_id=#{memberId}
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1