diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SyncNotice.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SyncNotice.java index 2d888957c..414234dde 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SyncNotice.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SyncNotice.java @@ -62,6 +62,15 @@ public class SyncNotice implements Serializable { * 店铺id */ private Long shopId; + /** + * 操作类型 0 新增 1 修改 + */ + private Integer operationType; + + /** + * 消息内容 + */ + private String content; /** * 创建时间 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SyncNoticeService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SyncNoticeService.java index 268bf1eee..ba1261afd 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SyncNoticeService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SyncNoticeService.java @@ -21,8 +21,9 @@ public interface SyncNoticeService extends IService { * @param name 商品/耗材名称 * @param id 商品/耗材id * @param type 0-商品 1-耗材 + * @param operationType 0-新增 1-修改 */ - void addNotice(Long shopId, Long sysUserId, String name, Long id, Integer type); + void addNotice(Long shopId, Long sysUserId, String name, Long id, Integer type, Integer operationType); Page pageInfo(Long shopId, String name, String startTime, String endTime, Integer type, Integer isRead); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SyncNoticeServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SyncNoticeServiceImpl.java index 7f0a47886..456c99e4b 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SyncNoticeServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SyncNoticeServiceImpl.java @@ -10,6 +10,7 @@ import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.SyncNotice; import com.czg.account.service.SyncNoticeService; import com.czg.service.account.mapper.SyncNoticeMapper; +import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,17 +21,35 @@ import java.util.List; * @author zs * @since 2025-04-07 */ -@Service +@DubboService public class SyncNoticeServiceImpl extends ServiceImpl implements SyncNoticeService { @Override - public void addNotice(Long shopId, Long sysUserId, String name, Long id, Integer type) { + public void addNotice(Long shopId, Long sysUserId, String name, Long id, Integer type, Integer operationType) { SyncNotice syncNotice = new SyncNotice(); syncNotice.setShopId(shopId); syncNotice.setSysUserId(sysUserId); syncNotice.setName(name); syncNotice.setSourceId(id); syncNotice.setType(type); + syncNotice.setOperationType(operationType); + String content = switch (operationType) { + case 0 -> "新增"; + case 1 -> "修改"; + default -> ""; + }; + + switch (type) { + case 0: + content += "商品"; + break; + case 1: + content += "耗材"; + break; + } + + content = StrUtil.format("{}: {}({}), 请及时确认;", content, name, id); + syncNotice.setContent(content); save(syncNotice); } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsInfoServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsInfoServiceImpl.java index 0ac3bfa32..2aef23f27 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsInfoServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.czg.service.product.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; +import com.czg.account.service.SyncNoticeService; import com.czg.enums.CrudEnum; import com.czg.enums.StatusEnum; import com.czg.enums.YesNoEnum; @@ -26,6 +27,7 @@ import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; import com.mybatisflex.spring.service.impl.ServiceImpl; import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,6 +50,9 @@ public class ConsInfoServiceImpl extends ServiceImpl i private final ConsGroupMapper consGroupMapper; private final ConsStockFlowMapper consStockFlowMapper; + @DubboReference + private SyncNoticeService syncNoticeService; + private QueryWrapper buildQueryWrapper(ConsInfoDTO param) { QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper(); if (ObjUtil.isNotNull(param.getConsGroupId())) { @@ -204,4 +209,4 @@ public class ConsInfoServiceImpl extends ServiceImpl i return data; } -} \ No newline at end of file +}