admin/tmerclub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改模块名称错误，增加es查询球杆商品

Browse Source
This commit is contained in:
杨旭 2025-04-20 09:49:02 +08:00
parent 4f8d52c93a
commit eb2c706121
29 changed files with 361 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tmerclub-api/pom.xml
View File

@ -27,6 +27,7 @@
<module>tmerclub-api-flow</module>
<module>tmerclub-api-payment</module>
<module>tmerclub-api-im</module>
<module>tmerclub-api-local</module>
</modules>
</project>

52
tmerclub-api/tmerclub-api-local/pom.xml Normal file
View File

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>tmerclub-api</artifactId>
<groupId>com.moyuer.cloud</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tmerclub-api-local</artifactId>
<packaging>jar</packaging>
<description>本地生活对内接口</description>
<dependencies>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-common-order</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-common-cache</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-common-local</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-api-product</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-api-marketing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-api-user</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-api-search</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

20
tmerclub-api/tmerclub-api-local/src/main/java/com/tmerclub/cloud/api/loacl/cuerecycle/feign/CueProductFeignClient.java Normal file
View File

@ -0,0 +1,20 @@
package com.tmerclub.cloud.api.loacl.cuerecycle.feign;
import com.tmerclub.cloud.common.local.bo.EsCueProductBO;
/**
* 球杆商品本地调用服务
*
* @author: frank
* @create: 2025-04-19
**/
public interface CueProductFeignClient {
/**
* 根据商品id获取商品信息
*
* @param productId 商品id
* @return 商品信息
*/
EsCueProductBO getEsCueProduct(Long productId);
}

2
tmerclub-api/tmerclub-api-order/pom.xml
View File

@ -25,7 +25,7 @@
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-common-loacl</artifactId>
<artifactId>tmerclub-common-local</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

2
tmerclub-common/tmerclub-common-loacl/src/main/java/com/tmerclub/cloud/common/local/dto/CurOderReturnsDTO.java → tmerclub-api/tmerclub-api-order/src/main/java/com/tmerclub/cloud/api/delivery/dto/CurOderReturnsDTO.java
View File

@ -1,4 +1,4 @@
package com.tmerclub.cloud.common.local.dto;
package com.tmerclub.cloud.api.delivery.dto;
import lombok.Data;

2
tmerclub-api/tmerclub-api-order/src/main/java/com/tmerclub/cloud/api/delivery/feign/DeliveryFeignClient.java
View File

@ -2,7 +2,7 @@ package com.tmerclub.cloud.api.delivery.feign;
import com.tmerclub.cloud.api.delivery.dto.CalculateAndGetDeliverInfoDTO;
import com.tmerclub.cloud.api.delivery.vo.ShopTransportVO;
import com.tmerclub.cloud.common.local.dto.CurOderReturnsDTO;
import com.tmerclub.cloud.api.delivery.dto.CurOderReturnsDTO;
import com.tmerclub.cloud.common.order.vo.TransportVO;
import com.tmerclub.cloud.common.order.vo.UserDeliveryInfoVO;
import com.tmerclub.cloud.common.response.ServerResponseEntity;

2
tmerclub-common/tmerclub-common-loacl/src/main/java/com/tmerclub/cloud/common/local/dto/SaveOrderToMallDTO.java → tmerclub-api/tmerclub-api-order/src/main/java/com/tmerclub/cloud/api/order/dto/SaveOrderToMallDTO.java
View File

@ -1,4 +1,4 @@
package com.tmerclub.cloud.common.local.dto;
package com.tmerclub.cloud.api.order.dto;
import lombok.Data;

2
tmerclub-api/tmerclub-api-order/src/main/java/com/tmerclub/cloud/api/order/feign/OrderFeignClient.java
View File

@ -11,7 +11,7 @@ import com.tmerclub.cloud.api.user.bo.UserOrderStatisticBO;
import com.tmerclub.cloud.api.user.bo.UserOrderStatisticListBO;
import com.tmerclub.cloud.api.user.dto.MemberReqDTO;
import com.tmerclub.cloud.common.exception.LuckException;
import com.tmerclub.cloud.common.local.dto.SaveOrderToMallDTO;
import com.tmerclub.cloud.api.order.dto.SaveOrderToMallDTO;
import com.tmerclub.cloud.common.order.bo.EsOrderBO;
import com.tmerclub.cloud.common.order.bo.OrderIdWithRefundIdBO;
import com.tmerclub.cloud.common.order.bo.OrderStatusBO;

2
tmerclub-common/pom.xml
View File

@ -24,7 +24,7 @@
<module>tmerclub-common-mongodb</module>
<module>tmerclub-common-leaf</module>
<module>tmerclub-common-sharding-proxy</module>
<module>tmerclub-common-loacl</module>
<module>tmerclub-common-local</module>
</modules>
</project>

2
tmerclub-common/tmerclub-common-loacl/pom.xml → tmerclub-common/tmerclub-common-local/pom.xml
View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tmerclub-common-loacl</artifactId>
<artifactId>tmerclub-common-local</artifactId>
<packaging>jar</packaging>
<description>tmerclub 本地生活相关代码</description>

30
tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/bo/EsCueBrandBO.java Normal file
View File

@ -0,0 +1,30 @@
package com.tmerclub.cloud.common.local.bo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* ES查询球杆品牌信息
*
* @author: frank
* @create: 2025-04-19
**/
@Data
public class EsCueBrandBO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 品牌ID
*/
private Long brandId;
/**
* 品牌名称
*/
private String brandName;
/**
* 品牌logo
*/
private String brandLogo;
}

63
tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/bo/EsCueProductBO.java Normal file
View File

@ -0,0 +1,63 @@
package com.tmerclub.cloud.common.local.bo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* ES查询球杆商品信息
*
* @author: frank
* @create: 2025-04-19
**/
@Data
public class EsCueProductBO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 球杆ID
*/
private Long productId;
/**
* 球杆类型ID
*/
private Long typeId;
/**
* 球杆品牌ID
*/
private Long brandId;
/**
* 球杆系列ID
*/
private Long seriesId;
/**
* 球杆名称
*/
private String productName;
/**
* 球杆描述
*/
private String productDescription;
/**
* 球杆图片
*/
private String productImages;
/**
* 球杆价格
*/
private Long productPrice;
/**
* 球杆品牌信息
*/
private EsCueBrandBO brandItem;
/**
* 球杆系列信息
*/
private EsCueSeriesBO seriesItem;
/**
* 球杆类型信息
*/
private EsCueTypeBO typeItem;
}

26
tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/bo/EsCueSeriesBO.java Normal file
View File

@ -0,0 +1,26 @@
package com.tmerclub.cloud.common.local.bo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* ES查询球杆系列信息
*
* @author: frank
* @create: 2025-04-19
**/
@Data
public class EsCueSeriesBO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 系列ID
*/
private Long seriesId;
/**
* 系列名称
*/
private String seriesName;
}

31
tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/bo/EsCueTypeBO.java Normal file
View File

@ -0,0 +1,31 @@
package com.tmerclub.cloud.common.local.bo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 类型信息
*
* @author: frank
* @create: 2025-04-19
**/
@Data
public class EsCueTypeBO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 类型ID
*/
private Long typeId;
/**
* 类型名称
*/
private String typeName;
/**
* 类型图片
*/
private String typeImage;
}

0
tmerclub-common/tmerclub-common-loacl/src/main/java/com/tmerclub/cloud/common/local/constant/CueOrderStatus.java → tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/constant/CueOrderStatus.java
View File

0
tmerclub-common/tmerclub-common-loacl/src/main/java/com/tmerclub/cloud/common/local/dto/CueProductSearchDTO.java → tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/dto/CueProductSearchDTO.java
View File

1
tmerclub-common/tmerclub-common-loacl/src/main/java/com/tmerclub/cloud/common/local/vo/CueBrandSearchVO.java → tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/vo/CueBrandSearchVO.java
View File

@ -5,7 +5,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 球杆品牌视图

0
tmerclub-common/tmerclub-common-loacl/src/main/java/com/tmerclub/cloud/common/local/vo/CueProductSearchVO.java → tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/vo/CueProductSearchVO.java
View File

1
tmerclub-common/tmerclub-common-loacl/src/main/java/com/tmerclub/cloud/common/local/vo/CueSeriesSearchVO.java → tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/vo/CueSeriesSearchVO.java
View File

@ -5,7 +5,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 球杆系列视图

1
tmerclub-common/tmerclub-common-loacl/src/main/java/com/tmerclub/cloud/common/local/vo/CueTypeSearchVO.java → tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/vo/CueTypeSearchVO.java
View File

@ -5,7 +5,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 球杆类型视图

2
tmerclub-local/pom.xml
View File

@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-common-loacl</artifactId>
<artifactId>tmerclub-api-local</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

82
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/feign/CueProductFeignController.java Normal file
View File

@ -0,0 +1,82 @@
package com.tmerclub.cloud.cuerecycle.feign;
import cn.hutool.core.util.ObjectUtil;
import com.tmerclub.cloud.api.loacl.cuerecycle.feign.CueProductFeignClient;
import com.tmerclub.cloud.common.local.bo.EsCueBrandBO;
import com.tmerclub.cloud.common.local.bo.EsCueProductBO;
import com.tmerclub.cloud.common.local.bo.EsCueSeriesBO;
import com.tmerclub.cloud.common.local.bo.EsCueTypeBO;
import com.tmerclub.cloud.cuerecycle.mapper.CueBrandMapper;
import com.tmerclub.cloud.cuerecycle.mapper.CueProductMapper;
import com.tmerclub.cloud.cuerecycle.mapper.CueSeriesMapper;
import com.tmerclub.cloud.cuerecycle.mapper.CueTypeMapper;
import com.tmerclub.cloud.cuerecycle.model.vo.CueBrandVO;
import com.tmerclub.cloud.cuerecycle.model.vo.CueProductVO;
import com.tmerclub.cloud.cuerecycle.model.vo.CueSeriesVO;
import com.tmerclub.cloud.cuerecycle.model.vo.CueTypeVO;
import jakarta.annotation.Resource;
import org.apache.dubbo.config.annotation.DubboService;
/**
* 球杆商品本地调用服务实现
*
* @author: frank
* @create: 2025-04-19
**/
@DubboService
public class CueProductFeignController implements CueProductFeignClient {
@Resource
CueProductMapper cueProductMapper;
@Resource
CueTypeMapper cueTypeMapper;
@Resource
CueBrandMapper cueBrandMapper;
@Resource
CueSeriesMapper cueSeriesMapper;
@Override
public EsCueProductBO getEsCueProduct(Long productId) {
// 查询ES结构数据
CueProductVO cueProductVO = cueProductMapper.getById(productId);
if (ObjectUtil.isNotNull(cueProductVO)) {
EsCueProductBO esCueProductBO = new EsCueProductBO();
esCueProductBO.setProductId(cueProductVO.getProductId());
esCueProductBO.setTypeId(cueProductVO.getTypeId());
esCueProductBO.setBrandId(cueProductVO.getBrandId());
esCueProductBO.setSeriesId(cueProductVO.getSeriesId());
esCueProductBO.setProductName(cueProductVO.getProductName());
esCueProductBO.setProductDescription(cueProductVO.getProductDescription());
esCueProductBO.setProductImages(cueProductVO.getProductImages());
esCueProductBO.setProductPrice(cueProductVO.getProductPrice());
// 查询关联品牌信息
EsCueBrandBO brandItem = new EsCueBrandBO();
if (ObjectUtil.isNotNull(cueProductVO.getBrandId())) {
CueBrandVO cueBrandVO = cueBrandMapper.getById(cueProductVO.getBrandId());
brandItem.setBrandId(cueBrandVO.getBrandId());
brandItem.setBrandName(cueBrandVO.getBrandName());
brandItem.setBrandLogo(cueBrandVO.getBrandLogo());
}
esCueProductBO.setBrandItem(brandItem);
// 查询关联系列信息
EsCueSeriesBO seriesItem = new EsCueSeriesBO();
if (ObjectUtil.isNotNull(cueProductVO.getSeriesId())) {
CueSeriesVO cueSeriesVO = cueSeriesMapper.getById(cueProductVO.getSeriesId());
seriesItem.setSeriesId(cueSeriesVO.getSeriesId());
seriesItem.setSeriesName(cueSeriesVO.getSeriesName());
}
esCueProductBO.setSeriesItem(seriesItem);
// 查询关联类型信息
EsCueTypeBO typeItem = new EsCueTypeBO();
if (ObjectUtil.isNotNull(cueProductVO.getTypeId())) {
CueTypeVO cueTypeVO = cueTypeMapper.getById(cueProductVO.getTypeId());
typeItem.setTypeId(cueTypeVO.getTypeId());
typeItem.setTypeName(cueTypeVO.getTypeName());
typeItem.setTypeImage(cueTypeVO.getTypeImage());
}
esCueProductBO.setTypeItem(typeItem);
return esCueProductBO;
}
return null;
}
}

4
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java
View File

@ -11,8 +11,8 @@ import com.tmerclub.cloud.api.user.feign.UserAddrFeignClient;
import com.tmerclub.cloud.api.user.feign.UserBalanceLogFeignClient;
import com.tmerclub.cloud.common.exception.LuckException;
import com.tmerclub.cloud.common.local.constant.CueOrderStatus;
import com.tmerclub.cloud.common.local.dto.CurOderReturnsDTO;
import com.tmerclub.cloud.common.local.dto.SaveOrderToMallDTO;
import com.tmerclub.cloud.api.delivery.dto.CurOderReturnsDTO;
import com.tmerclub.cloud.api.order.dto.SaveOrderToMallDTO;
import com.tmerclub.cloud.common.order.vo.OrderAddrVO;
import com.tmerclub.cloud.common.order.vo.UserAddrVO;
import com.tmerclub.cloud.common.response.ServerResponseEntity;

2
tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
View File

@ -193,7 +193,7 @@
<if test="sendNumber != null and sendNumber != ''">
send_number = #{sendNumber},
</if>
<if test="warehouse_id != null">
<if test="warehouseId != null">
warehouse_id = #{warehouseId},
</if>
<if test="orderAddrId != null">

2
tmerclub-order/pom.xml
View File

@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-common-loacl</artifactId>
<artifactId>tmerclub-common-local</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

2
tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/feign/DeliveryFeignController.java
View File

@ -7,7 +7,7 @@ import com.tmerclub.cloud.api.delivery.feign.DeliveryFeignClient;
import com.tmerclub.cloud.api.delivery.vo.ShopTransportVO;
import com.tmerclub.cloud.api.user.feign.UserAddrFeignClient;
import com.tmerclub.cloud.common.constant.Constant;
import com.tmerclub.cloud.common.local.dto.CurOderReturnsDTO;
import com.tmerclub.cloud.api.delivery.dto.CurOderReturnsDTO;
import com.tmerclub.cloud.common.order.vo.*;
import com.tmerclub.cloud.common.response.ServerResponseEntity;
import com.tmerclub.cloud.common.util.BeanUtil;

2
tmerclub-order/src/main/java/com/tmerclub/cloud/order/feign/OrderFeignController.java
View File

@ -22,7 +22,7 @@ import com.tmerclub.cloud.common.exception.LuckException;
import com.tmerclub.cloud.common.i18n.LanguageEnum;
import com.tmerclub.cloud.common.leaf.manager.SegmentManager;
import com.tmerclub.cloud.common.local.constant.CueOrderStatus;
import com.tmerclub.cloud.common.local.dto.SaveOrderToMallDTO;
import com.tmerclub.cloud.api.order.dto.SaveOrderToMallDTO;
import com.tmerclub.cloud.common.order.bo.EsOrderBO;
import com.tmerclub.cloud.common.order.bo.OrderIdWithRefundIdBO;
import com.tmerclub.cloud.common.order.bo.OrderStatusBO;

7
tmerclub-search/pom.xml
View File

@ -31,7 +31,12 @@
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-common-loacl</artifactId>
<artifactId>tmerclub-common-local</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.moyuer.cloud</groupId>
<artifactId>tmerclub-api-local</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

37
tmerclub-search/src/main/java/com/tmerclub/cloud/search/listener/CueProductCanalListener.java
View File

@ -1,7 +1,13 @@
package com.tmerclub.cloud.search.listener;
import cn.hutool.core.util.ObjectUtil;
import com.tmerclub.cloud.api.loacl.cuerecycle.feign.CueProductFeignClient;
import com.tmerclub.cloud.common.local.bo.EsCueProductBO;
import com.tmerclub.cloud.search.bo.CueProductBO;
import com.tmerclub.cloud.search.canal.model.CanalBinLogResult;
import com.tmerclub.cloud.search.constant.EsIndexEnum;
import com.tmerclub.cloud.search.util.EsSearchUtil;
import org.apache.dubbo.config.annotation.DubboReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@ -17,13 +23,40 @@ public class CueProductCanalListener extends BaseCanalBinlogEventThrowExceptionP
private static final Logger log = LoggerFactory.getLogger(CueProductCanalListener.class);
@DubboReference
CueProductFeignClient cueProductFeignClient;
@Override
protected void processInsertInternal(CanalBinLogResult<CueProductBO> result) {
log.error("球杆商品新增:{}", result.getDatabaseName());
log.info("球杆商品新增:{}", result.getDatabaseName());
CueProductBO afterData = result.getAfterData();
EsCueProductBO esCueProductBO = getEsCueProductData(afterData.getProductId());
if (ObjectUtil.isNull(esCueProductBO)) {
log.error("球杆商品新增异常ID:{}", afterData.getProductId());
return;
}
EsSearchUtil.esSave(afterData.getProductId(), EsIndexEnum.CUE_PRODUCT, esCueProductBO);
}
@Override
protected void processUpdateInternal(CanalBinLogResult<CueProductBO> result) {
log.error("球杆商品修改:{}", result.getDatabaseName());
log.info("球杆商品修改:{}", result.getDatabaseName());
CueProductBO afterData = result.getAfterData();
EsCueProductBO esCueProductBO = getEsCueProductData(afterData.getProductId());
if (ObjectUtil.isNull(esCueProductBO)) {
log.error("球杆商品修改异常ID:{}", afterData.getProductId());
return;
}
EsSearchUtil.esUpdate(afterData.getProductId(), EsIndexEnum.CUE_PRODUCT, esCueProductBO);
}
/**
* 获取球杆商品数据
*
* @param productId 商品ID
* @return 球杆商品数据
*/
private EsCueProductBO getEsCueProductData(Long productId) {
return cueProductFeignClient.getEsCueProduct(productId);
}
}