Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
4a47c06d72
|
|
@ -142,6 +142,7 @@ public class OrderInfoRpcServiceImpl implements OrderInfoRpcService {
|
|||
log.error("调用商品服务扣减库存失败", e);
|
||||
throw e;
|
||||
}
|
||||
log.info("OrderService.--------------------------------------------库存更新成功");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import com.czg.service.product.mapper.ProdConsRelationMapper;
|
|||
import com.czg.service.product.mapper.ProductMapper;
|
||||
import com.mybatisflex.core.query.QueryWrapper;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboService;
|
||||
import org.springframework.cache.annotation.CacheEvict;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
@ -35,6 +36,7 @@ import java.util.Map;
|
|||
* @author tankaikai
|
||||
* @since 2025-03-01 10:19
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
@DubboService
|
||||
public class ProductRpcServiceImpl implements ProductRpcService {
|
||||
|
|
@ -106,7 +108,12 @@ public class ProductRpcServiceImpl implements ProductRpcService {
|
|||
consStockFlowMapper.insert(consStockFlow);
|
||||
}
|
||||
}
|
||||
rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId));
|
||||
try {
|
||||
rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId));
|
||||
} catch (Exception e) {
|
||||
log.error("发送商品信息变更Mq消息失败:", e);
|
||||
}
|
||||
log.info("ProductService.--------------------------------------------库存更新成功");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import com.czg.product.dto.ProdConsRelationDTO;
|
|||
import com.czg.product.dto.ProdSkuDTO;
|
||||
import com.czg.product.dto.ProductDTO;
|
||||
import com.czg.product.entity.ConsInfo;
|
||||
import com.czg.product.entity.ProdConsRelation;
|
||||
import com.czg.product.entity.ProdSku;
|
||||
import com.czg.product.entity.Product;
|
||||
import com.czg.product.enums.ProductIsSaleTypeEnum;
|
||||
|
|
@ -166,7 +165,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
|
|||
ProductDTO dto = super.getOneAs(queryWrapper, ProductDTO.class);
|
||||
List<ProdSkuDTO> skuList = prodSkuMapper.selectListByQueryAs(query().eq(ProdSku::getProductId, id).eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()), ProdSkuDTO.class);
|
||||
dto.setSkuList(skuList);
|
||||
List<ProdConsRelationDTO> consList = prodConsRelationMapper.selectListByQueryAs(query().eq(ProdConsRelation::getProductId, dto.getId()), ProdConsRelationDTO.class);
|
||||
List<ProdConsRelationDTO> consList = prodConsRelationMapper.selectListByProdId(dto.getId());
|
||||
dto.setConsList(consList);
|
||||
return dto;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue