From 8f15b46ab4d034d6482f589a5eebcd3e3f8a020d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 18:52:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=81=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/OldShopDAO.java | 31 ++++++++++++ .../com/cool/store/mapper/OldShopMapper.java | 14 ++++++ .../main/resources/mapper/OldShopMapper.xml | 17 +++++++ .../java/com/cool/store/entity/OldShopDO.java | 47 +++++++++++++++++++ .../store/service/impl/ShopServiceImpl.java | 16 ++++++- 5 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/OldShopMapper.java create mode 100644 coolstore-partner-dao/src/main/resources/mapper/OldShopMapper.xml create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/OldShopDO.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java new file mode 100644 index 000000000..00a80d9d2 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java @@ -0,0 +1,31 @@ +package com.cool.store.dao; + +import com.cool.store.entity.OldShopDO; +import com.cool.store.mapper.OldShopMapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Repository; +import tk.mybatis.mapper.entity.Example; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author: WangShuo + * @Date: 2025/04/12/18:36 + * @Version 1.0 + * @注释: + */ +@Repository +public class OldShopDAO { + @Resource + private OldShopMapper oldShopMapper; + + public List getByMobile(String mobile) { + if (StringUtils.isBlank(mobile)){ + return null; + } + Example example = new Example(OldShopDO.class); + example.createCriteria().andEqualTo("mobile", mobile); + return oldShopMapper.selectByExample(example); + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OldShopMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OldShopMapper.java new file mode 100644 index 000000000..07ee5acdd --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OldShopMapper.java @@ -0,0 +1,14 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.OldShopDO; +import tk.mybatis.mapper.common.BaseMapper; +import tk.mybatis.mapper.common.Mapper; + +/** + * @Author: WangShuo + * @Date: 2025/04/12/18:33 + * @Version 1.0 + * @注释: + */ +public interface OldShopMapper extends Mapper { +} diff --git a/coolstore-partner-dao/src/main/resources/mapper/OldShopMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OldShopMapper.xml new file mode 100644 index 000000000..fa668e9e9 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/OldShopMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + id, shop_code, shop_name,mobile, create_time, update_time + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/OldShopDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/OldShopDO.java new file mode 100644 index 000000000..f4f786a7d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/OldShopDO.java @@ -0,0 +1,47 @@ +package com.cool.store.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import javax.persistence.*; +import java.util.Date; + +@Data +@Table(name = "xfsg_old_shop") +public class OldShopDO { + + /** + * 主键ID + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Long id; + + /** + * 门店编码 + */ + @Column(name = "shop_code") + private String shopCode; + + @Column(name = "shop_name") + private String shopName; + + /** + * 手机号 + */ + @Column(name = "mobile") + private String mobile; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; +} \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 1f8983d66..f2ed49817 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -55,6 +55,9 @@ import static com.cool.store.enums.ErrorCodeEnum.UPDATE_INVESTMENT_MANAGER_FAIL; @Service @Slf4j public class ShopServiceImpl implements ShopService { + + @Resource + private OldShopDAO oldShopDAO; @Value("${mybatis.configuration.variables.enterpriseId}") private String eid; @Resource @@ -578,6 +581,7 @@ public class ShopServiceImpl implements ShopService { @Override public ShopResponse getShopNameAndCode(Long shopId, Long lineId) { boolean flag = false; + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId); MiniShopsResponse shopInfo = shopInfoDAO.currentShopWhetherOpen(shopId,eid); ShopResponse response = new ShopResponse(); if (Objects.nonNull(shopInfo)&&StringUtils.isNotBlank(shopInfo.getShopCode())) { @@ -596,9 +600,19 @@ public class ShopServiceImpl implements ShopService { dto.setShopCode(shopInfoDO.getShopCode()); list.add(dto); } - response.setShopList(list); flag = true; } + List oldMobile = oldShopDAO.getByMobile(lineInfoDO.getMobile()); + if (CollectionUtils.isNotEmpty(oldMobile)){ + for (OldShopDO oldShopDO : oldMobile){ + ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); + dto.setShopName(oldShopDO.getShopName()); + dto.setShopCode(oldShopDO.getShopCode()); + list.add(dto); + } + flag = true; + } + response.setShopList(list); if (flag) { return response; } else {